Update libraries and plugins dependencies

Author: ileasile

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

@@ -49,6 +49,6 @@ val NamedVersionCatalogsExtension.Versions.stableKotlin get() = get("stableKotli
 val NamedVersionCatalogsExtension.Versions.gradleKotlin get() = get("gradleKotlin")
 val NamedVersionCatalogsExtension.Versions.ktlint get() = get("ktlint")
 
-val NamedVersionCatalogsExtension.Dependencies.junitApi get() = get("test-junit-api")
-val NamedVersionCatalogsExtension.Dependencies.junitEngine get() = get("test-junit-engine")
-val NamedVersionCatalogsExtension.Dependencies.kotlinTest get() = get("kotlin-stable-test")
+val NamedVersionCatalogsExtension.Dependencies.junitApi get() = get("test.junit.api")
+val NamedVersionCatalogsExtension.Dependencies.junitEngine get() = get("test.junit.engine")
+val NamedVersionCatalogsExtension.Dependencies.kotlinTest get() = get("kotlin.stable.test")

build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
     implementation(libs.kotlin.dev.scriptingCommon)
 
     // Embedded version of serialization plugin for notebook code
-    implementation(libs.serialization.dev.embeddedPlugin)
+    implementation(libs.serialization.dev.embedded)
 
     // Logging
     implementation(libs.logging.slf4j.api)

docs/README.md

@@ -8,7 +8,7 @@
 
 # Kotlin kernel for IPython/Jupyter
 
-[Kotlin](https://kotlinlang.org/) (1.6.0-dev-1733) kernel for [Jupyter](https://jupyter.org).
+[Kotlin](https://kotlinlang.org/) (1.6.0-dev-3567) kernel for [Jupyter](https://jupyter.org).
 
 Beta version. Tested with Jupyter Notebook 6.0.3, Jupyter Lab 1.2.6 and Jupyter Console 6.1.0
 on Windows, Ubuntu Linux and macOS.

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.6.0-dev-1733"
+kotlin = "1.6.0-dev-3567"
 stableKotlin = "1.5.21"
 gradleKotlin = "1.4.31"
 shadowJar = "7.0.0"
@@ -8,20 +8,20 @@ kotlinxSerialization = "1.2.2"
 kotlinxCoroutines = "1.5.1"
 ktlintGradle = "10.0.0"
 ktlint = "0.40.0"
-publishPlugin = "0.0.54-dev"
+publishPlugin = "0.0.57-dev"
 versionsPlugin = "0.39.0"
 
 slf4j = "1.7.32"
-logback = "1.2.4"
-http4k = "4.10.1.0"
-jupyterApi = "0.10.0-146"
-jetbrainsAnnotations = "21.0.1"
+logback = "1.2.5"
+http4k = "4.11.0.1"
+jupyterApi = "0.10.0-215"
+jetbrainsAnnotations = "22.0.0"
 
 junit = "5.7.2"
-kotlinTest = "4.6.1"
+kotlinTest = "4.6.2"
 clikt = "2.8.0"
 zeromq = "0.5.2"
-gson = "2.8.7"
+gson = "2.8.8"
 
 jlatexmath = "1.0.7"
 xmlgraphicsFop = "2.6"
@@ -59,11 +59,11 @@ kotlin-gradle-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib",
 kotlin-gradle-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "gradleKotlin" }
 kotlin-gradle-stdlibJdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "gradleKotlin" }
 kotlin-gradle-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "gradleKotlin" }
-kotlin-gradle-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "gradleKotlin" }
+kotlin-gradle-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "gradleKotlin" }
 
 # Serialization compiler plugin (for Dev Kotlin)
-serialization-dev-embeddedPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
-serialization-dev-unshadedPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization-unshaded", version.ref = "kotlin" }
+serialization-dev-embedded = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
+serialization-dev-unshaded = { group = "org.jetbrains.kotlin", name = "kotlin-serialization-unshaded", version.ref = "kotlin" }
 
 # Serialization runtime
 serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
@@ -127,7 +127,7 @@ plugin-publisher = { module = "ru.ileasile:kotlin-libs-publisher", version.ref =
 plugin-changelog = { module = "gradle.plugin.org.hildan.gradle:gradle-github-changelog", version.ref = "changelogPlugin" }
 
 # id("com.github.ben-manes.versions")
-plugin-versionsPlugin = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsPlugin" }
+plugin-versionsUpdater = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "versionsPlugin" }
 
 # Published artifacts of this project as binary dependencies
 jupyter-api = { group = "org.jetbrains.kotlinx", name = "kotlin-jupyter-api", version.ref = "jupyterApi" }
@@ -144,5 +144,5 @@ allGradlePlugins = [
     "plugin-ktlint",
     "plugin-publisher",
     "plugin-changelog",
-    "plugin-versionsPlugin",
+    "plugin-versionsUpdater",
 ]

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

gradlew

@@ -20,7 +20,7 @@ dependencies {
     // Temporary solution until Kotlin 1.4 will be supported in
     // .kts buildscripts and it will be possible to use
     // kotlinx.serialization in plugin code
-    implementation(libs.kotlin.gradle.gradlePlugin)
+    implementation(libs.kotlin.gradle.gradle)
     implementation(libs.gson)
 
     testImplementation(projects.api)

jupyter-lib/kotlin-jupyter-api-gradle-plugin/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     compileOnly(libs.serialization.json)
 
     // Serialization compiler plugin (for notebooks, not for kernel code)
-    compileOnly(libs.serialization.dev.unshadedPlugin)
+    compileOnly(libs.serialization.dev.unshaded)
 
     // Logging
     compileOnly(libs.logging.slf4j.api)

jupyter-lib/shared-compiler/build.gradle.kts

@@ -247,15 +247,7 @@ fun getSimpleCompiler(
     evaluationConfiguration: ScriptEvaluationConfiguration,
 ): JupyterCompiler {
     class SimpleReplCompiler(hostConfiguration: ScriptingHostConfiguration) :
-        KJvmReplCompilerBase<ReplCodeAnalyzerBase>(
-            hostConfiguration = hostConfiguration,
-            initAnalyzer = { sharedScriptCompilationContext, scopeProcessor ->
-                ReplCodeAnalyzerBase(
-                    sharedScriptCompilationContext.environment,
-                    implicitsResolutionFilter = scopeProcessor
-                )
-            }
-        )
+        KJvmReplCompilerBase<ReplCodeAnalyzerBase>(hostConfiguration)
 
     return JupyterCompilerImpl(
         SimpleReplCompiler(