Kotlin 1.9.10

motorro · Sep 14, 2023 · abddef5 · abddef5
1 parent cc82795
commit abddef5
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 60 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: set up JDK 1.11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.11
+          java-version: 17
       - name: Cache
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,10 +14,10 @@ jobs:
         with:
           fetch-depth: 0
           ref: refs/remotes/origin/master
-      - name: set up JDK 1.11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.11
+          java-version: 17
       - name: Cache
         uses: actions/cache@v2
         with:

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/deeplink/build.gradle.kts b/deeplink/build.gradle.kts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_VARIABLE", "EXPERIMENTAL_API_USAGE")
+@file:Suppress("EXPERIMENTAL_API_USAGE")
 
 import java.net.URI
 
@@ -38,7 +38,7 @@ kotlin {
 
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
             kotlinOptions.freeCompilerArgs += listOf(
                 "-Xuse-ir"
             )
@@ -58,18 +58,18 @@ kotlin {
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
         browser {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 
@@ -177,9 +177,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
 }
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
+}
diff --git a/gradle.properties b/gradle.properties
@@ -11,10 +11,9 @@
 # limitations under the License.
 #
 
-org.gradle.jvmargs=-Dfile.encoding=UTF-8 -XX:MaxPermSize=512m -Xmx4096M
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.caching=true
 org.gradle.configureondemand=true
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
 kotlin.js.generate.executable.default=false
 kotlin.mpp.stability.nowarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-kotlin = "1.8.10"
-dokka = "1.7.20"
-serialization = "1.4.1"
+kotlin = "1.9.10"
+dokka = "1.9.0"
+serialization = "1.6.0"
 
 [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" }
-nexus_publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.0.0" }
+nexus_publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
 
 [libraries]
 kotlin-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -12,7 +12,7 @@
 #
 
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/mocks/build.gradle.kts b/mocks/build.gradle.kts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_VARIABLE", "EXPERIMENTAL_API_USAGE")
+@file:Suppress("EXPERIMENTAL_API_USAGE")
 
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
@@ -32,7 +32,7 @@ kotlin {
 
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
             kotlinOptions.freeCompilerArgs += listOf(
                 "-Xuse-ir"
             )
@@ -52,18 +52,18 @@ kotlin {
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
         browser {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 

diff --git a/push/build.gradle.kts b/push/build.gradle.kts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_VARIABLE", "EXPERIMENTAL_API_USAGE")
+@file:Suppress("EXPERIMENTAL_API_USAGE")
 
 import java.net.URI
 
@@ -38,7 +38,7 @@ kotlin {
 
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
             kotlinOptions.freeCompilerArgs += listOf(
                 "-Xuse-ir"
             )
@@ -58,18 +58,18 @@ kotlin {
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
         browser {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 
@@ -175,9 +175,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
 }
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,7 +20,6 @@ pluginManagement {
         mavenCentral()
     }
 }
-enableFeaturePreview("VERSION_CATALOGS")
 dependencyResolutionManagement {
     repositories {
         mavenLocal()

diff --git a/testaction/build.gradle.kts b/testaction/build.gradle.kts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_VARIABLE", "EXPERIMENTAL_API_USAGE", "OPT_IN_IS_NOT_ENABLED")
+@file:Suppress("EXPERIMENTAL_API_USAGE")
 
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
 
@@ -54,7 +54,7 @@ kotlin {
 
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
             kotlinOptions.freeCompilerArgs += listOf(
                 "-Xuse-ir"
             )
@@ -74,24 +74,24 @@ kotlin {
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
             // On customizing JS builds and distribution:
             // https://kotlinlang.org/docs/reference/js-project-setup.html#choosing-execution-environment
             @OptIn(ExperimentalDistributionDsl::class)
-            distribution {
-                directory = file("$projectDir/output/npm")
-            }
+            distribution(Action {
+                outputDirectory.set(file("$projectDir/output/npm"))
+            })
         }
         browser {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 

diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_VARIABLE", "EXPERIMENTAL_API_USAGE")
+@file:Suppress("EXPERIMENTAL_API_USAGE")
 
 import java.net.URI
 
@@ -38,7 +38,7 @@ kotlin {
 
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = "17"
             kotlinOptions.freeCompilerArgs += listOf(
                 "-Xuse-ir"
             )
@@ -58,18 +58,18 @@ kotlin {
         binaries.library()
         useCommonJs()
         nodejs {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
         browser {
-            testTask {
+            testTask(Action {
                 useMocha {
                     timeout = "10s"
                 }
-            }
+            })
         }
     }
 
@@ -175,9 +175,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
 }
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
+}
diff --git a/uri/src/commonMain/kotlin/com/motorro/keeplink/uri/PshComponentsSerializer.kt b/uri/src/commonMain/kotlin/com/motorro/keeplink/uri/PshComponentsSerializer.kt
@@ -33,7 +33,6 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * Serializes [PshComponents]
  */
-@Serializer(forClass = PshComponents::class)
 @OptIn(ExperimentalSerializationApi::class)
 object PshComponentsSerializer : KSerializer<PshComponents> {
     /**