K2 Repl Support

This MR contains all the required infrastructure to support the new K2 Repl.

- It bumps Kotlin to the latest release: 2.2.0-RC2.
- KSP support is removed because it is holding us back from using the latest Kotlin Compiler releases as we have to wait for releases for public versions.
- The default is still K1, all unit tests for K1 are green. All unit tests are also green for K2, but running them all from the command line results in OOM errors. This is still being investigated.
- For kernels running K2, the Kotlin language version is bumped from 1.9 to 2.2.
- I had to bump ktlint as well, but this introduces a ton of minor changes. So, for now, I have disabled ktlint warnings, but as soon as this MR is merged. I will make a new MR where ktlint is re-enabled.

Merge-request: KDS-MR-74
Merged-by: Christian Melchior <[email protected]>

Author: cmelchior

.editorconfig

@@ -1,3 +1,6 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
+
+[compilers.kt]
+ktlint_standard_filename = disabled

api-examples/getting-started/build.gradle.kts

@@ -1,13 +1,24 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2
 plugins {
-    id("com.google.devtools.ksp")
     kotlin("jvm")
     kotlin("jupyter.api")
     kotlin("libs.publisher")
 }
 
 kotlinJupyter {
     addApiDependency()
-    addScannerDependency()
+}
+
+// Creates the metadata needed for the library integration to be detected automatically.
+tasks.processJupyterApiResources {
+    libraryProducers = listOf("org.jetbrains.kotlinx.jupyter.example.GettingStartedIntegration")
+}
+
+kotlin {
+    compilerOptions {
+        apiVersion.set(KOTLIN_2_2)
+        languageVersion.set(KOTLIN_2_2)
+    }
 }
 
 dependencies {

api-examples/getting-started/src/main/kotlin/org/jetbrains/kotlinx/jupyter/example/GettingStartedIntegration.kt

@@ -1,10 +1,8 @@
 package org.jetbrains.kotlinx.jupyter.example
 
 import org.jetbrains.kotlinx.jupyter.api.FieldHandlerByRuntimeClass
-import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 
-@JupyterLibrary
 class GettingStartedIntegration : JupyterIntegration() {
     override fun Builder.onLoaded() {
         /**

build-plugin/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -29,9 +30,14 @@ val myJvmTarget = libs.versions.jvmTarget.get()
 val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf("-opt-in=kotlin.RequiresOptIn")
-        jvmTarget = myJvmTarget
+    compilerOptions {
+        freeCompilerArgs.addAll(listOf(
+            "-opt-in=kotlin.RequiresOptIn",
+            // Fix for https://jakewharton.com/kotlins-jdk-release-compatibility-flag/
+            // See https://youtrack.jetbrains.com/issue/KT-49746/Support-Xjdk-release-in-gradle-toolchain#focus=Comments-27-9473530.0-0
+            "-Xjdk-release=$myJvmTarget"
+        ))
+        jvmTarget.set(JvmTarget.fromTarget(myJvmTarget))
     }
 }
 

build-plugin/common-dependencies/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("libs.publisher")
     kotlin("jvm")
@@ -25,14 +27,12 @@ sourceSets {
 val myJvmTarget = libs.versions.jvmTarget.get()
 val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        apiVersion = "1.4"
-        languageVersion = "1.4"
-
-        freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
-
-        this.jvmTarget = myJvmTarget
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
+        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+        this.jvmTarget.set(JvmTarget.fromTarget(myJvmTarget))
     }
 }
 

build-plugin/common-dependencies/src/org/jetbrains/kotlinx/jupyter/common/ReplLineMagic.kt

@@ -1,5 +1,19 @@
 package org.jetbrains.kotlinx.jupyter.common
 
+/**
+ * This class defines the magic commands available to users of a notebook. They are accessed
+ * by using the `%<enumNameInCamelCase>` syntax inside a notebook.
+ *
+ * Example:
+ *
+ * ```
+ * // Snippet 1
+ * %useLatestDescriptors
+ * println("Hello world")
+ * ```
+ *
+ * Adding a new magic value also requires registering a handler in [org.jetbrains.kotlinx.jupyter.magics.AbstractMagicsHandler].
+ */
 enum class ReplLineMagic(val desc: String, val argumentsUsage: String? = null, val visibleInHelp: Boolean = true) {
     USE(
         "Imports supported libraries and injects code from these libraries" +

build-plugin/plugin-versions-plugin/settings.gradle.kts

@@ -3,9 +3,15 @@
 rootProject.name = "plugin-versions"
 
 pluginManagement {
+    val sharedProps = java.util.Properties().apply {
+        load(File(rootDir.parentFile.parent, "shared.properties").inputStream())
+    }
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        // Artifacts here are guaranteed to not be removed, unlike https://packages.jetbrains.team/maven/p/kt/dev.
+        // But note that /kt/dev is updated faster.
+        maven(sharedProps.getProperty("kotlin.repository"))
         if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
             mavenLocal()
         }
@@ -17,6 +23,9 @@ plugins {
 }
 
 dependencyResolutionManagement {
+    val sharedProps = java.util.Properties().apply {
+        load(File(rootDir.parentFile.parent, "shared.properties").inputStream())
+    }
     versionCatalogs {
         create("libs") {
             from(files("../../gradle/libs.versions.toml"))
@@ -25,6 +34,7 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven(sharedProps.getProperty("kotlin.repository"))
         if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
             mavenLocal()
         }

build-plugin/settings.gradle.kts

@@ -1,16 +1,18 @@
 @file:Suppress("UnstableApiUsage")
 
-import org.gradle.kotlin.dsl.mavenCentral
-import org.gradle.kotlin.dsl.repositories
-
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "build"
 
 pluginManagement {
     repositories {
+        val sharedProps = java.util.Properties().apply {
+            load(File(rootDir.parent, "shared.properties").inputStream())
+        }
         mavenCentral()
         gradlePluginPortal()
+        maven(sharedProps.getProperty("kotlin.repository"))
+        maven(sharedProps.getProperty("kotlin.ds.repository"))
         if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
             mavenLocal()
         }
@@ -22,6 +24,9 @@ plugins {
 }
 
 dependencyResolutionManagement {
+    val sharedProps = java.util.Properties().apply {
+        load(File(rootDir.parent, "shared.properties").inputStream())
+    }
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
@@ -30,7 +35,8 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
-        maven("https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven")
+        maven(sharedProps.getProperty("kotlin.repository"))
+        maven(sharedProps.getProperty("kotlin.ds.repository"))
         if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
             mavenLocal()
         }

build-plugin/src/build/BuildSettingsExtension.kt

@@ -12,6 +12,8 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 class BuildSettingsExtension(private val project: Project) {
@@ -39,18 +41,21 @@ class BuildSettingsExtension(private val project: Project) {
         withApiVersion(level)
     }
 
+
     fun withLanguageVersion(version: String) {
+        val kotlinVersion = KotlinVersion.fromVersion(version)
         project.tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                languageVersion = version
+            compilerOptions {
+                languageVersion.set(kotlinVersion)
             }
         }
     }
 
     fun withApiVersion(version: String) {
+        val kotlinVersion = KotlinVersion.fromVersion(version)
         project.tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                apiVersion = version
+            compilerOptions {
+                apiVersion.set(kotlinVersion)
             }
         }
     }
@@ -74,16 +79,16 @@ class BuildSettingsExtension(private val project: Project) {
     fun withCompilerArgs(configure: KotlinCompilerArgsBuilder.() -> Unit) {
         val argsList = KotlinCompilerArgsBuilder().apply(configure).build()
         project.tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                freeCompilerArgs += argsList
+            compilerOptions {
+                freeCompilerArgs.addAll(argsList)
             }
         }
     }
 
     fun withJvmTarget(target: String) {
         project.tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                this.jvmTarget = target
+            compilerOptions {
+                jvmTarget.set(JvmTarget.fromTarget(target))
             }
         }
 

build-plugin/src/build/KernelBuildConfigurator.kt

@@ -97,6 +97,8 @@ internal class KernelBuildConfigurator(private val project: Project) {
             plugins.apply("org.jlleitschuh.gradle.ktlint")
             extensions.configure<KtlintExtension> {
                 version.set(ktlintVersion)
+                // TEMPORARY CHANGE: Until K2 REPL has been merged to master to avoid too many changes at once.
+                ignoreFailures.set(true)
                 enableExperimentalRules.set(true)
             }
         }

build-plugin/src/build/RootSettingsExtension.kt

@@ -82,9 +82,6 @@ class RootSettingsExtension(
             CompatibilityAttribute("kotlinLanguageLevel", "Kotlin language level") {
                 kotlinLanguageLevel
             },
-            CompatibilityAttribute("kspVersion", "KSP") {
-                projectVersions.ksp
-            },
         )
     }
 

build-plugin/src/build/util/repositories.kt

@@ -3,13 +3,14 @@ package build.util
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.maven
 import org.gradle.kotlin.dsl.repositories
+import java.io.File
 
 const val INTERNAL_TEAMCITY_URL = "https://buildserver.labs.intellij.net"
 const val PUBLIC_TEAMCITY_URL = "https://teamcity.jetbrains.com"
 
 class TeamcityProject(
     val url: String,
-    val projectId: String
+    val projectId: String,
 )
 
 val INTERNAL_KOTLIN_TEAMCITY = TeamcityProject(INTERNAL_TEAMCITY_URL, "Kotlin_KotlinDev_Artifacts")
@@ -20,12 +21,14 @@ const val TEAMCITY_REQUEST_ENDPOINT = "guestAuth/app/rest/builds"
 fun Project.addAllBuildRepositories() {
     val kotlinVersion = rootProject.defaultVersionCatalog.versions.devKotlin
 
+    val sharedProps = java.util.Properties().apply {
+        load(File(rootDir, "shared.properties").inputStream())
+    }
+
     repositories {
         mavenCentral()
         gradlePluginPortal()
-
-        // Kotlin Dev releases are published here every night
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+        maven(sharedProps.getProperty("kotlin.repository"))
 
         for (teamcity in listOf(INTERNAL_KOTLIN_TEAMCITY, PUBLIC_KOTLIN_TEAMCITY)) {
             val locator = "buildType:(id:${teamcity.projectId}),number:$kotlinVersion,branch:default:any/artifacts/content/maven"

build.gradle.kts

@@ -13,6 +13,7 @@ import org.jetbrains.kotlinx.publisher.apache2
 import org.jetbrains.kotlinx.publisher.composeOfTaskOutputs
 import org.jetbrains.kotlinx.publisher.developer
 import org.jetbrains.kotlinx.publisher.githubRepo
+import java.util.Properties
 
 plugins {
     id("build.plugins.main")
@@ -29,12 +30,37 @@ val spaceUsername: String by properties
 val spaceToken: String by properties
 
 ktlint {
+    version.set(libs.versions.ktlint.get())
+    // TEMPORARY CHANGE: Until K2 REPL has been merged to master to avoid too many changes at once.
+    ignoreFailures.set(true)
     filter {
         exclude("**/org/jetbrains/kotlinx/jupyter/repl.kt")
     }
 }
 
+val sharedProps =
+    Properties().apply {
+        load(File(rootDir, "shared.properties").inputStream())
+    }
+
+repositories {
+    mavenCentral()
+    maven(sharedProps.getProperty("kotlin.repository"))
+    maven(sharedProps.getProperty("kotlin.ds.repository"))
+    maven {
+        name = "intellij-deps"
+        url = uri("https://www.jetbrains.com/intellij-repository/releases/")
+    }
+    if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
+        mavenLocal()
+    }
+}
+
 dependencies {
+    // Required by K2KJvmReplCompilerWithCompletion.
+    // Should be moved to Kotlin Compiler eventually once complete
+    compileOnly("com.jetbrains.intellij.platform:util:243.22562.220")
+
     implementation(libs.kotlin.dev.stdlib)
 
     // Dependency on module with compiler.
@@ -71,6 +97,8 @@ dependencies {
     // Test dependencies: kotlin-test and Junit 5
     testImplementation(libs.test.junit.params)
     testImplementation(libs.test.kotlintest.assertions)
+    testImplementation(libs.kotlin.dev.scriptingDependenciesMavenAll)
+
 
     deploy(projects.lib)
     deploy(projects.api)

docs/README.md

@@ -9,7 +9,7 @@
 
 # Kotlin Kernel for Jupyter notebooks
 
-The Kotlin Kernel for Jupyter notebooks is a powerful tool that allows you to write and run [Kotlin](https://kotlinlang.org/) 1.9.23 code within the
+The Kotlin Kernel for Jupyter notebooks is a powerful tool that allows you to write and run [Kotlin](https://kotlinlang.org/) 2.2.0-RC2 code within the
 [Jupyter Notebook](https://jupyter.org) environment. This [Kernel](https://docs.jupyter.org/en/latest/projects/kernels.html) essentially acts as a bridge between Jupyter Notebook and the Kotlin compiler.
 
 <img src="images/kotlin_notebook.gif" width="900" height="700" alt="Alt text for the GIF">
@@ -90,7 +90,7 @@ Start using the Kotlin Kernel for Jupyter notebooks:
 
 ### Kotlin version support
 
-The latest version of the Kotlin Kernel for notebooks uses the Kotlin compiler of version 1.9.23.
+The latest version of the Kotlin Kernel for notebooks uses the Kotlin compiler of version 2.2.0-RC2.
 
 ### Jupyter environments