Try to tidy up the native build system more. This includes not

building wasm in all modes (host mode).
pdvrieze · Jan 2, 2024 · 86055ad · 86055ad
1 parent 789ba1d
commit 86055ad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 72 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2018.
+ * Copyright (c) 2024.
  *
- * This file is part of XmlUtil.
+ * This file is part of xmlutil.
  *
  * This file is licenced to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -69,7 +69,6 @@ allprojects {
         }
         mavenLocal()
         mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")}
         google()
     }
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -20,7 +20,6 @@
 
 import net.devrieze.gradle.ext.*
 import org.gradle.api.attributes.java.TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -124,21 +123,6 @@ kotlin {
         }
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmWasi {
-        nodejs()
-    }
-
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        nodejs()
-        browser {
-            testTask {
-                isEnabled = ! System.getenv().containsKey("GITHUB_ACTION")
-            }
-        }
-    }
-
     targets.all {
         mavenPublication {
             version = xmlutil_core_version

diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -26,7 +26,6 @@ import net.devrieze.gradle.ext.applyDefaultXmlUtilHierarchyTemplate
 import net.devrieze.gradle.ext.configureDokka
 import net.devrieze.gradle.ext.doPublish
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
@@ -104,22 +103,6 @@ kotlin {
         }
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmWasi {
-        nodejs()
-    }
-
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        moduleName="core-wasm"
-        nodejs()
-        browser {
-            testTask {
-                isEnabled = ! System.getenv().containsKey("GITHUB_ACTION")
-            }
-        }
-    }
-
     targets.all {
         if (this is KotlinJvmTarget) {
             testRuns.all {

diff --git a/serialutil/build.gradle.kts b/serialutil/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -24,7 +24,6 @@ import net.devrieze.gradle.ext.addNativeTargets
 import net.devrieze.gradle.ext.applyDefaultXmlUtilHierarchyTemplate
 import net.devrieze.gradle.ext.configureDokka
 import net.devrieze.gradle.ext.doPublish
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -77,21 +76,6 @@ kotlin {
         }
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmWasi {
-        nodejs()
-    }
-
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        nodejs()
-        browser {
-            testTask {
-                isEnabled = !System.getenv().containsKey("GITHUB_ACTION")
-            }
-        }
-    }
-
     targets.all {
         mavenPublication {
             version = xmlutil_util_version

diff --git a/testutil/build.gradle.kts b/testutil/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -23,7 +23,6 @@
 import net.devrieze.gradle.ext.addNativeTargets
 import net.devrieze.gradle.ext.configureDokka
 import net.devrieze.gradle.ext.doPublish
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -72,21 +71,6 @@ kotlin {
         }
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmWasi {
-        nodejs()
-    }
-
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        nodejs()
-        browser {
-            testTask {
-                isEnabled = ! System.getenv().containsKey("GITHUB_ACTION")
-            }
-        }
-    }
-
     sourceSets {
         val commonMain by getting {
             dependencies {