Merge pull request #4 from motorro/Dependency-updates-2024-12

Dependency updates 2024 12
motorro · Dec 3, 2024 · 757bf02 · 757bf02
2 parents 3e2dec5 + ab52d13
commit 757bf02
Show file tree

Hide file tree

Showing 24 changed files with 6,541 additions and 6,482 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -13,15 +13,16 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -34,7 +35,7 @@ jobs:
       - name: Check with gradle
         run: ./gradlew check
       - name: Upload Tests results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: allTests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,16 +10,17 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: refs/remotes/origin/master
       - name: set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,11 +52,8 @@ allprojects {
     }
 
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                "-Xinline-classes"
-            )
+        compilerOptions {
+            freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
         }
     }
 

diff --git a/deeplink/build.gradle.kts b/deeplink/build.gradle.kts
@@ -12,7 +12,10 @@
  */
 
 @file:Suppress("EXPERIMENTAL_API_USAGE")
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.net.URI
 
 plugins {
@@ -42,11 +45,8 @@ kotlin {
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-Xuse-ir"
-            )
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         testRuns["test"].executionTask.configure {
             useJUnit()
@@ -55,27 +55,25 @@ kotlin {
 
     js(IR) {
         moduleName = "deeplink"
-        compilations.all {
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-opt-in=kotlin.js.ExperimentalJsExport"
-            )
+        compilerOptions {
+            freeCompilerArgs.add("-opt-in=kotlin.js.ExperimentalJsExport")
         }
         generateTypeScriptDefinitions()
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
         browser {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
     }
 
@@ -95,34 +93,14 @@ kotlin {
                 implementation(libs.test.kotlin.annotations.common)
             }
         }
-        val iosX64Main by sourceSets.getting
-        val iosArm64Main by sourceSets.getting
-        val iosSimulatorArm64Main by sourceSets.getting
-        val iosMain by sourceSets.creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-        val iosX64Test by sourceSets.getting
-        val iosArm64Test by sourceSets.getting
-        val iosSimulatorArm64Test by sourceSets.getting
-        val iosTest by sourceSets.creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
         val jvmMain by getting
         val jvmTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
         val jsMain by getting
         val jsTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.1.0"
 dokka = "1.9.20"
-serialization = "1.6.3"
+serialization = "1.7.3"
 
 [plugins]
 kotlin_multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin_dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-git = { id = "org.ajoberstar.grgit", version = "3.0.0" }
+git = { id = "org.ajoberstar.grgit", version = "5.0.0" }
 nexus_publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
 
 [libraries]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,18 +1,6 @@
-#
-# Copyright 2022 Nikolai Kotchetkov.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#    http://www.apache.org/licenses/LICENSE-2.0
-# 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.
-#
-
+#Tue Dec 03 11:27:47 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/mocks/build.gradle.kts b/mocks/build.gradle.kts
@@ -12,6 +12,11 @@
  */
 
 @file:Suppress("EXPERIMENTAL_API_USAGE")
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
@@ -36,11 +41,8 @@ kotlin {
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-Xuse-ir"
-            )
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         testRuns["test"].executionTask.configure {
             useJUnit()
@@ -49,27 +51,25 @@ kotlin {
 
     js(IR) {
         moduleName = "mocks"
-        compilations.all {
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-opt-in=kotlin.js.ExperimentalJsExport"
-            )
+        compilerOptions {
+            freeCompilerArgs.add("-opt-in=kotlin.js.ExperimentalJsExport")
         }
         generateTypeScriptDefinitions()
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
         browser {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
     }
 
@@ -87,34 +87,14 @@ kotlin {
                 implementation(libs.test.kotlin.annotations.common)
             }
         }
-        val iosX64Main by sourceSets.getting
-        val iosArm64Main by sourceSets.getting
-        val iosSimulatorArm64Main by sourceSets.getting
-        val iosMain by sourceSets.creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-        val iosX64Test by sourceSets.getting
-        val iosArm64Test by sourceSets.getting
-        val iosSimulatorArm64Test by sourceSets.getting
-        val iosTest by sourceSets.creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
         val jvmMain by getting
         val jvmTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
         val jsMain by getting
         val jsTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }

diff --git a/push/build.gradle.kts b/push/build.gradle.kts
@@ -12,7 +12,10 @@
  */
 
 @file:Suppress("EXPERIMENTAL_API_USAGE")
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
 
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.net.URI
 
 plugins {
@@ -42,11 +45,8 @@ kotlin {
     }
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-Xuse-ir"
-            )
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         testRuns["test"].executionTask.configure {
             useJUnit()
@@ -55,27 +55,25 @@ kotlin {
 
     js(IR) {
         moduleName = "keeplink"
-        compilations.all {
-            kotlinOptions.freeCompilerArgs += listOf(
-                "-opt-in=kotlin.js.ExperimentalJsExport"
-            )
+        compilerOptions {
+            freeCompilerArgs.add("-opt-in=kotlin.js.ExperimentalJsExport")
         }
         generateTypeScriptDefinitions()
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
         browser {
-            testTask(Action {
+            testTask {
                 useMocha {
                     timeout = "10s"
                 }
-            })
+            }
         }
     }
 
@@ -93,34 +91,14 @@ kotlin {
                 implementation(libs.test.kotlin.annotations.common)
             }
         }
-        val iosX64Main by sourceSets.getting
-        val iosArm64Main by sourceSets.getting
-        val iosSimulatorArm64Main by sourceSets.getting
-        val iosMain by sourceSets.creating {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-        val iosX64Test by sourceSets.getting
-        val iosArm64Test by sourceSets.getting
-        val iosSimulatorArm64Test by sourceSets.getting
-        val iosTest by sourceSets.creating {
-            dependsOn(commonTest)
-            iosX64Test.dependsOn(this)
-            iosArm64Test.dependsOn(this)
-            iosSimulatorArm64Test.dependsOn(this)
-        }
         val jvmMain by getting
         val jvmTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
         val jsMain by getting
         val jsTest by getting {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }