Update Kotlin, Gradle and ShadowJAR versions

Add new ShadowJAR transformer for correct packing of plexus components whic are used in Maven resolver

Author: ileasile

build.gradle.kts

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.ComponentsXmlResourceTransformer
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.jupyter.build.getFlag
 import org.jetbrains.kotlinx.jupyter.plugin.options
@@ -103,6 +104,7 @@ dependencies {
     implKotlin("scripting-compiler-impl-embeddable")
     implKotlin("scripting-compiler-embeddable")
     implKotlin("scripting-ide-services")
+    implKotlin("scripting-dependencies")
     implKotlin("scripting-dependencies-maven")
     implKotlin("script-util")
     implKotlin("scripting-common")
@@ -153,6 +155,7 @@ tasks.shadowJar {
     archiveBaseName.set(taskOptions.packageName)
     archiveClassifier.set("")
     mergeServiceFiles()
+    transform(ComponentsXmlResourceTransformer())
 
     manifest {
         attributes(tasks.jar.get().manifest.attributes)

docs/README.md

@@ -8,7 +8,7 @@
 
 # Kotlin kernel for IPython/Jupyter
 
-[Kotlin](https://kotlinlang.org/) (1.5.30-dev-598) kernel for [Jupyter](https://jupyter.org).
+[Kotlin](https://kotlinlang.org/) (1.5.30-dev-1044) 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.properties

@@ -1,11 +1,11 @@
 # kotlinVersion=1.5.255-SNAPSHOT
-kotlinVersion=1.5.30-dev-598
+kotlinVersion=1.5.30-dev-1044
 stableKotlinVersion=1.5.0
 kotlinLanguageLevel=1.5
 stableKotlinLanguageLevel=1.5
 jvmTarget=1.8
 
-shadowJarVersion=6.1.0
+shadowJarVersion=7.0.0
 kotlinxSerializationVersion=1.1.0
 ktlintGradleVersion=10.0.0
 ktlintVersion=0.40.0

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.plugin-publish") version "0.12.0"
+    id("com.gradle.plugin-publish")
     id("org.jlleitschuh.gradle.ktlint")
     `java-gradle-plugin`
     `kotlin-dsl`

settings.gradle.kts

@@ -35,7 +35,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             when (requested.id.id) {
-                "com.github.johnrengelman.shadow" -> useModule("com.github.jengelman.gradle.plugins:shadow:$shadowJarVersion")
+                "com.github.johnrengelman.shadow" -> useModule("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:$shadowJarVersion")
                 "org.jlleitschuh.gradle.ktlint" -> useModule("org.jlleitschuh.gradle:ktlint-gradle:$ktlintGradleVersion")
             }
         }