Merge pull request #1041 from mikepenz/feature/upgrade_dependencies_2…

…0241129 Upgrade to Kotlin 2.1 | Gradle 8.11.1
mikepenz · Nov 29, 2024 · 80682f6 · 80682f6
2 parents cf3e4fa + 2ff4e73
commit 80682f6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/aboutlibraries-core/build.gradle.kts b/aboutlibraries-core/build.gradle.kts
@@ -94,9 +94,15 @@ kotlin {
     watchosDeviceArm64()
 
     // common sets
-    ios()
-    tvos()
-    watchos()
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    tvosSimulatorArm64()
+    watchosX64()
+    watchosArm64()
+    watchosSimulatorArm64()
 
     /*
     cocoapods {

diff --git a/app-desktop/src/main/resources/aboutlibraries.json b/app-desktop/src/main/resources/aboutlibraries.json
@@ -1,6 +1,6 @@
 {
     "metadata": {
-        "generated": "2024-11-16T14:12:37.75Z"
+        "generated": "2024-11-29T14:41:44.149Z"
     },
     "libraries": [
         {
@@ -160,7 +160,7 @@
                     "name": "Mike Penz"
                 }
             ],
-            "artifactVersion": "11.3.0-b01",
+            "artifactVersion": "11.3.0-rc01",
             "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
             "scm": {
                 "connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -183,7 +183,7 @@
                     "name": "Mike Penz"
                 }
             ],
-            "artifactVersion": "11.3.0-b01",
+            "artifactVersion": "11.3.0-rc01",
             "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
             "scm": {
                 "connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -663,7 +663,7 @@
                     "name": "Kotlin Team"
                 }
             ],
-            "artifactVersion": "2.0.21",
+            "artifactVersion": "2.1.0",
             "description": "Kotlin Standard Library",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/kotlin.git",
@@ -757,7 +757,7 @@
                     "name": "JetBrains Team"
                 }
             ],
-            "artifactVersion": "0.3.7",
+            "artifactVersion": "0.3.8",
             "description": "Kotlin Immutable Collections multiplatform library",
             "scm": {
                 "url": "https://github.com/Kotlin/kotlinx.collections.immutable"

diff --git a/app-test/files/aboutlibraries.json b/app-test/files/aboutlibraries.json
diff --git a/app-wasm/src/commonMain/composeResources/files/aboutlibraries.json b/app-wasm/src/commonMain/composeResources/files/aboutlibraries.json
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ targetSdk = "35"
 gradleBuild = "8.7.2"
 # kotlin
 dokka = "1.9.20"
-kotlinCore = { require = "2.0.21" }
+kotlinCore = { require = "2.1.0" }
 kotlinCoroutines = { require = "1.9.0" }
 kotlinxSerialization = "1.7.3"
 kotlinxCollections = "0.3.8"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME