Update Gradle, Kotlin and KSP

Author: ileasile

build.gradle.kts

@@ -33,11 +33,11 @@ dependencies {
     implementation(libs.kotlin.dev.scriptingCompilerEmbeddable)
     implementation(libs.kotlin.dev.scriptingIdeServices)
     implementation(libs.kotlin.dev.scriptingDependenciesMavenAll)
-    implementation(libs.kotlin.dev.scriptUtil)
     implementation(libs.kotlin.dev.scriptingCommon)
+    implementation(libs.kotlin.dev.scriptingJvm)
 
     // Embedded version of serialization plugin for notebook code
-    implementation(libs.serialization.dev.embedded)
+    implementation(libs.serialization.dev.embeddedPlugin)
 
     // Logging
     implementation(libs.logging.slf4j.api)

docs/README.md

@@ -9,7 +9,7 @@
 
 # Kotlin Kernel for IPython/Jupyter
 
-[Kotlin](https://kotlinlang.org/) (1.8.20) [kernel](https://docs.jupyter.org/en/latest/projects/kernels.html) for [Jupyter](https://jupyter.org).
+[Kotlin](https://kotlinlang.org/) (1.9.0) [kernel](https://docs.jupyter.org/en/latest/projects/kernels.html) for [Jupyter](https://jupyter.org).
 
 The kernel is a powerful engine designed to enhance your Kotlin REPL experience. It offers support for executing code cells,
 providing basic code completion, and analyzing errors. With the Kotlin kernel, you gain access to a range of features,

gradle.properties

@@ -1,7 +1,8 @@
 baseVersion=0.12.0
 
-kotlinLanguageLevel=1.8
-stableKotlinLanguageLevel=1.8
+# kotlin.experimental.tryK2=true
+kotlinLanguageLevel=1.9
+stableKotlinLanguageLevel=1.9
 
 kotlin.jupyter.add.api=false
 kotlin.jupyter.add.scanner=false

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 jvmTarget = "1.8"
 
-kotlin = "1.8.20"
-stableKotlin = "1.8.20"
-gradleKotlin = "1.8.20"
-ksp = "1.8.20-1.0.10"
+kotlin = "1.9.0"
+stableKotlin = "1.9.0"
+gradleKotlin = "1.9.0"
+ksp = "1.9.0-1.0.12"
 shadowJar = "7.1.2"
 changelogPlugin = "1.12.1"
 kotlinxSerialization = "1.4.1"
@@ -51,7 +51,6 @@ kotlin-dev-scriptingCompilerEmbeddable = { group = "org.jetbrains.kotlin", name
 kotlin-dev-scriptingIdeServices = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-ide-services", version.ref = "kotlin" }
 kotlin-dev-scriptingDependencies = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-dependencies", version.ref = "kotlin" }
 kotlin-dev-scriptingDependenciesMavenAll = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-dependencies-maven-all", version.ref = "kotlin" }
-kotlin-dev-scriptUtil = { group = "org.jetbrains.kotlin", name = "kotlin-script-util", version.ref = "kotlin" }
 kotlin-dev-scriptingCommon = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-common", version.ref = "kotlin" }
 kotlin-dev-scriptingJvm = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm", version.ref = "kotlin" }
 kotlin-dev-scriptRuntime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
@@ -75,6 +74,7 @@ plugin-ksp = { group="com.google.devtools.ksp", name="com.google.devtools.ksp.gr
 
 # Serialization compiler plugin (for Dev Kotlin)
 serialization-dev-embedded = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
+serialization-dev-embeddedPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization-compiler-plugin-embeddable", version.ref = "kotlin" }
 serialization-dev-unshaded = { group = "org.jetbrains.kotlin", name = "kotlin-serialization-unshaded", version.ref = "kotlin" }
 
 # Serialization runtime

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -8,6 +8,7 @@ import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
 import org.jetbrains.kotlinx.jupyter.util.EMPTY
+import java.util.Locale
 
 /**
  * Jupyter connection socket types
@@ -24,7 +25,7 @@ enum class JupyterSocketType {
     IOPUB;
 }
 
-val JupyterSocketType.nameForUser get() = name.toLowerCase()
+val JupyterSocketType.nameForUser get() = name.lowercase(Locale.getDefault())
 val JupyterSocketType.portField get() = "${nameForUser}_port"
 
 /**

jupyter-lib/api/src/main/kotlin/org/jetbrains/kotlinx/jupyter/api/libraries/connection.kt

@@ -2,7 +2,7 @@ package org.jetbrains.kotlinx.jupyter.api.plugin.util
 
 import org.gradle.api.NamedDomainObjectCollection
 
-internal fun <T> NamedDomainObjectCollection<T>.whenAdded(condition: (T) -> Boolean, action: (T) -> Unit) {
+internal fun <T : Any> NamedDomainObjectCollection<T>.whenAdded(condition: (T) -> Boolean, action: (T) -> Unit) {
     val element = find(condition)
     if (element != null) {
         action(element)

jupyter-lib/kotlin-jupyter-api-gradle-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/api/plugin/util/domainCollectionUtil.kt

@@ -10,7 +10,7 @@ fun <A, V> createCachedFun(calculate: (A) -> V): (A) -> V {
 fun <A, K, V> createCachedFun(calculateKey: (A) -> K, calculate: (A) -> V): (A) -> V {
     val cache = ConcurrentHashMap<Optional<K>, Optional<V>>()
 
-    @Suppress("USELESS_CAST")
+    @Suppress("UNCHECKED_CAST")
     return { argument ->
         val key = Optional.ofNullable(calculateKey(argument)) as Optional<K>
         cache.getOrPut(key) {