chore(deps): update dependency org.jetbrains.kotlin.multiplatform to …

…v2 (#231) * chore(deps): update dependency org.jetbrains.kotlin.multiplatform to v2 * chore: Update .gitignore to include new '.kotlin' Signed-off-by: Mohamed Darwish <[email protected]> * chore: Update yarn.lock Signed-off-by: Mohamed Darwish <[email protected]> * build: Use jvmToolchain instead of kotlinOptions.jvmTarget Signed-off-by: Mohamed Darwish <[email protected]> * build: Use Karma tests on Chrome and Firefox for browser Signed-off-by: Mohamed Darwish <[email protected]> --------- Signed-off-by: Mohamed Darwish <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mohamed Darwish <[email protected]>
MayakaApps · Nov 25, 2024 · 435d552 · 435d552
1 parent f320542
commit 435d552
Show file tree

Hide file tree

Showing 6 changed files with 1,572 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,12 @@
 **/build/
 !**/src/**/build/
 
+#
+# Kotlin
+#
+
+.kotlin
+
 #
 # IntelliJ
 #

diff --git a/file-kache/build.gradle.kts b/file-kache/build.gradle.kts
@@ -8,25 +8,13 @@ plugins {
 kotlin {
     explicitApi()
 
-    jvm {
-        compilations.configureEach {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-    }
-
-    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
-        testTask {
-            useMocha {
-                timeout = "30s"
-            }
-        }
-    }
+    jvm()
+    jvmToolchain(8)
 
     js {
         // JS browser target has no FileSystem implementation in Okio
-        // browser { configureTests() }
-
-        nodejs { configureTests() }
+        // browser()
+        nodejs()
     }
 
     // Still experimental - blocked by coroutines

diff --git a/gradle.properties b/gradle.properties
@@ -4,6 +4,7 @@
 
 kotlin.code.style=official
 kotlin.native.ignoreDisabledTargets=true
+kotlin.js.browser.karma.browsers=chrome-headless,firefox-headless
 
 #
 # Publishing Configuration

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.25"
+kotlin = "2.0.21"
 
 dokka = "1.9.20"
 mavenPublish = "0.30.0"

diff --git a/kache/build.gradle.kts b/kache/build.gradle.kts
@@ -8,23 +8,12 @@ plugins {
 kotlin {
     explicitApi()
 
-    jvm {
-        compilations.configureEach {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-    }
-
-    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
-        testTask {
-            useMocha {
-                timeout = "30s"
-            }
-        }
-    }
+    jvm()
+    jvmToolchain(8)
 
     js {
-        browser { configureTests() }
-        nodejs { configureTests() }
+        browser()
+        nodejs()
     }
 
     // Still experimental - blocked by coroutines