Merge branch 'jb/wasm' into jb/wasm-disable-windows-ci

# Conflicts: # kermit-core/build.gradle.kts # kermit-simple/build.gradle.kts # kermit-test/build.gradle.kts # kermit/build.gradle.kts
touchlab · Oct 10, 2023 · aff7c63 · aff7c63
2 parents 713bfff + 061761e
commit aff7c63
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 51 deletions.
diff --git a/convention-plugins/src/main/kotlin/wasm-setup.gradle.kts b/convention-plugins/src/main/kotlin/wasm-setup.gradle.kts
@@ -7,14 +7,17 @@
  *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
+
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     kotlin("multiplatform")
 }
 
 kotlin {
     val wasmEnabled = project.findProperty("enableWasm") == "true"
     if (wasmEnabled) {
-        @Suppress("OPT_IN_USAGE")
+        @OptIn(ExperimentalWasmDsl::class)
         wasm {
             browser()
             nodejs()
@@ -23,15 +26,15 @@ kotlin {
         }
     }
     sourceSets {
-        val jsWasmMain by creating
-        val jsWasmTest by creating
+        val jsAndWasmMain by creating
+        val jsAndWasmTest by creating
         if (wasmEnabled) {
             val wasmMain by getting {
-                dependsOn(jsWasmMain)
+                dependsOn(jsAndWasmMain)
             }
 
             val wasmTest by getting {
-                dependsOn(jsWasmTest)
+                dependsOn(jsAndWasmTest)
             }
         }
     }

diff --git a/extensions/kermit-bugsnag/build.gradle.kts b/extensions/kermit-bugsnag/build.gradle.kts
@@ -11,6 +11,7 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -21,7 +22,7 @@ plugins {
 
 apply(from = "../../gradle/configure-crash-logger.gradle")
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()

diff --git a/extensions/kermit-crashlytics/build.gradle.kts b/extensions/kermit-crashlytics/build.gradle.kts
@@ -11,6 +11,7 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -22,7 +23,7 @@ plugins {
 apply(from = "../../gradle/configure-crash-logger.gradle")
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()

diff --git a/extensions/kermit-koin/build.gradle.kts b/extensions/kermit-koin/build.gradle.kts
@@ -11,6 +11,7 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -20,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()

diff --git a/kermit-core/build.gradle.kts b/kermit-core/build.gradle.kts
@@ -11,8 +11,8 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -23,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()
@@ -110,11 +110,12 @@ kotlin {
             dependsOn(nativeTest)
         }
 
-        val jsWasmMain by getting {
+        val jsAndWasmMain by getting {
             dependsOn(commonMain)
             getByName("jsMain").dependsOn(this)
         }
-        val jsWasmTest by getting {
+
+        val jsAndWasmTest by getting {
             dependsOn(commonTest)
             getByName("jsTest").dependsOn(this)
         }

diff --git a/kermit-core/src/darwinTest/wasmMain/kotlin/co/touchlab/kermit/Js.ConsoleActual.kt b/kermit-core/src/darwinTest/wasmMain/kotlin/co/touchlab/kermit/Js.ConsoleActual.kt
diff --git a/...otlin/co/touchlab/kermit/ConsoleWriter.kt → ...otlin/co/touchlab/kermit/ConsoleWriter.kt b/...otlin/co/touchlab/kermit/ConsoleWriter.kt → ...otlin/co/touchlab/kermit/ConsoleWriter.kt
diff --git a/.../touchlab/kermit/JsMutableLoggerConfig.kt → .../touchlab/kermit/JsMutableLoggerConfig.kt b/.../touchlab/kermit/JsMutableLoggerConfig.kt → .../touchlab/kermit/JsMutableLoggerConfig.kt
diff --git a/...kotlin/co/touchlab/kermit/KermitConfig.kt → ...kotlin/co/touchlab/kermit/KermitConfig.kt b/...kotlin/co/touchlab/kermit/KermitConfig.kt → ...kotlin/co/touchlab/kermit/KermitConfig.kt
diff --git a/...n/co/touchlab/kermit/platformLogWriter.kt → ...n/co/touchlab/kermit/platformLogWriter.kt b/...n/co/touchlab/kermit/platformLogWriter.kt → ...n/co/touchlab/kermit/platformLogWriter.kt
diff --git a/...n/co/touchlab/kermit/ConsoleWriterTest.kt → ...n/co/touchlab/kermit/ConsoleWriterTest.kt b/...n/co/touchlab/kermit/ConsoleWriterTest.kt → ...n/co/touchlab/kermit/ConsoleWriterTest.kt
diff --git a/...in/co/touchlab/kermit/Js.ConsoleActual.kt → .../co/touchlab/kermit/Wasm.ConsoleActual.kt b/...in/co/touchlab/kermit/Js.ConsoleActual.kt → .../co/touchlab/kermit/Wasm.ConsoleActual.kt
diff --git a/kermit-simple/build.gradle.kts b/kermit-simple/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 
 /*
@@ -20,7 +21,7 @@ plugins {
 }
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     js {
         browser()
@@ -70,11 +71,11 @@ kotlin {
             dependsOn(getByName("commonTest"))
         }
 
-        val jsWasmMain by getting {
+        val jsAndWasmMain by getting {
             dependsOn(nonKotlinMain)
             getByName("jsMain").dependsOn(this)
         }
-        val jsWasmTest by getting {
+        val jsAndWasmTest by getting {
             dependsOn(nonKotlinTest)
             getByName("jsTest").dependsOn(this)
         }

diff --git a/kermit-test/build.gradle.kts b/kermit-test/build.gradle.kts
@@ -11,6 +11,7 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -22,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()

diff --git a/kermit/build.gradle.kts b/kermit/build.gradle.kts
@@ -11,11 +11,9 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
-import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.time.Duration
 
 plugins {
     id("com.android.library")
@@ -25,7 +23,7 @@ plugins {
 }
 
 kotlin {
-    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget {
         publishAllLibraryVariants()
@@ -65,6 +63,7 @@ kotlin {
                 api(project(":kermit-core"))
             }
         }
+
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
@@ -85,12 +84,12 @@ kotlin {
             dependsOn(nonKotlinMain)
         }
 
-        val jsWasmMain by getting {
+        val jsAndWasmMain by getting {
             dependsOn(nonKotlinMain)
             getByName("jsMain").dependsOn(this)
         }
 
-        val jsWasmTest by getting {
+        val jsAndWasmTest by getting {
             dependsOn(nonKotlinTest)
             getByName("jsTest").dependsOn(this)
         }

diff --git a/...ain/kotlin/co/touchlab/kermit/Defaults.kt → ...ain/kotlin/co/touchlab/kermit/Defaults.kt b/...ain/kotlin/co/touchlab/kermit/Defaults.kt → ...ain/kotlin/co/touchlab/kermit/Defaults.kt
diff --git a/samples/sample-production/shared/build.gradle.kts b/samples/sample-production/shared/build.gradle.kts
@@ -8,6 +8,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -37,6 +38,7 @@ val KERMIT_VERSION: String by project
 version = "0.0.1"
 
 kotlin {
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget()
     ios()

diff --git a/samples/sample/shared/build.gradle.kts b/samples/sample/shared/build.gradle.kts
@@ -8,6 +8,8 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -37,13 +39,15 @@ val KERMIT_VERSION: String by project
 version = "0.0.1"
 
 kotlin {
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     targetHierarchy.default()
     androidTarget()
     ios()
     iosSimulatorArm64()
     js {
         browser()
     }
+    @OptIn(ExperimentalWasmDsl::class)
     wasm {
         browser()
     }