Skip to content

Commit 80682f6

Browse files
authored
Merge pull request #1041 from mikepenz/feature/upgrade_dependencies_20241129
Upgrade to Kotlin 2.1 | Gradle 8.11.1
2 parents cf3e4fa + 2ff4e73 commit 80682f6

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

aboutlibraries-core/build.gradle.kts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,15 @@ kotlin {
9494
watchosDeviceArm64()
9595

9696
// common sets
97-
ios()
98-
tvos()
99-
watchos()
97+
iosX64()
98+
iosArm64()
99+
iosSimulatorArm64()
100+
tvosX64()
101+
tvosArm64()
102+
tvosSimulatorArm64()
103+
watchosX64()
104+
watchosArm64()
105+
watchosSimulatorArm64()
100106

101107
/*
102108
cocoapods {

app-desktop/src/main/resources/aboutlibraries.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"metadata": {
3-
"generated": "2024-11-16T14:12:37.75Z"
3+
"generated": "2024-11-29T14:41:44.149Z"
44
},
55
"libraries": [
66
{
@@ -160,7 +160,7 @@
160160
"name": "Mike Penz"
161161
}
162162
],
163-
"artifactVersion": "11.3.0-b01",
163+
"artifactVersion": "11.3.0-rc01",
164164
"description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
165165
"scm": {
166166
"connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -183,7 +183,7 @@
183183
"name": "Mike Penz"
184184
}
185185
],
186-
"artifactVersion": "11.3.0-b01",
186+
"artifactVersion": "11.3.0-rc01",
187187
"description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
188188
"scm": {
189189
"connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -663,7 +663,7 @@
663663
"name": "Kotlin Team"
664664
}
665665
],
666-
"artifactVersion": "2.0.21",
666+
"artifactVersion": "2.1.0",
667667
"description": "Kotlin Standard Library",
668668
"scm": {
669669
"connection": "scm:git:https://github.com/JetBrains/kotlin.git",
@@ -757,7 +757,7 @@
757757
"name": "JetBrains Team"
758758
}
759759
],
760-
"artifactVersion": "0.3.7",
760+
"artifactVersion": "0.3.8",
761761
"description": "Kotlin Immutable Collections multiplatform library",
762762
"scm": {
763763
"url": "https://github.com/Kotlin/kotlinx.collections.immutable"

app-test/files/aboutlibraries.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app-wasm/src/commonMain/composeResources/files/aboutlibraries.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ targetSdk = "35"
77
gradleBuild = "8.7.2"
88
# kotlin
99
dokka = "1.9.20"
10-
kotlinCore = { require = "2.0.21" }
10+
kotlinCore = { require = "2.1.0" }
1111
kotlinCoroutines = { require = "1.9.0" }
1212
kotlinxSerialization = "1.7.3"
1313
kotlinxCollections = "0.3.8"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)