Update Gradle wrapper (all-in-all commit)

ileasile · ileasile · commit 236ce82509fd · 2023-03-10T13:31:06.000+01:00
diff --git a/build-plugin/common-dependencies/build.gradle.kts b/build-plugin/common-dependencies/build.gradle.kts
@@ -27,6 +27,9 @@ sourceSets {
     }
 }
 
+val myJvmTarget = libs.versions.jvmTarget.get()
+val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()
+
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
         apiVersion = "1.4"
@@ -35,7 +38,13 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         @Suppress("SuspiciousCollectionReassignment")
         freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
 
-        jvmTarget = libs.versions.jvmTarget.get()
+        this.jvmTarget = myJvmTarget
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(myJvmTargetInt))
     }
 }
 
diff --git a/build-plugin/plugin-versions-plugin/build.gradle.kts b/build-plugin/plugin-versions-plugin/build.gradle.kts
@@ -21,9 +21,18 @@ dependencies {
     }
 }
 
+val myJvmTarget = libs.versions.jvmTarget.get()
+val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()
+
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = libs.versions.jvmTarget.get()
+        jvmTarget = myJvmTarget
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(myJvmTargetInt))
     }
 }
 
diff --git a/build-plugin/plugin-versions-plugin/settings.gradle.kts b/build-plugin/plugin-versions-plugin/settings.gradle.kts
@@ -2,6 +2,10 @@
 
 rootProject.name = "plugin-versions"
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
diff --git a/build-plugin/settings.gradle.kts b/build-plugin/settings.gradle.kts
@@ -1,10 +1,13 @@
 @file:Suppress("UnstableApiUsage")
 
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "build"
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
diff --git a/build-plugin/src/build/BuildSettingsExtension.kt b/build-plugin/src/build/BuildSettingsExtension.kt
@@ -15,7 +15,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 class BuildSettingsExtension(private val project: Project) {
-    fun withTests() {
+    fun withTests(configure: Test.() -> Unit = {}) {
         val deps = project.defaultVersionCatalog.dependencies
 
         project.dependencies {
@@ -30,6 +30,7 @@ class BuildSettingsExtension(private val project: Project) {
             testLogging {
                 events("passed", "skipped", "failed")
             }
+            configure()
         }
     }
 
diff --git a/build-plugin/src/build/InstallTasksConfigurator.kt b/build-plugin/src/build/InstallTasksConfigurator.kt
@@ -42,6 +42,7 @@ class InstallTasksConfigurator(
         val groupName = if (local) LOCAL_INSTALL_GROUP else DISTRIBUTION_GROUP
         val cleanDirTask = project.tasks.named(makeTaskName(settings.cleanInstallDirTaskPrefix, local))
         val shadowJar = project.tasks.named(SHADOW_JAR_TASK)
+        val jarTask = project.tasks.named(JAR_TASK)
         val updateLibrariesTask = project.tasks.named(UPDATE_LIBRARIES_TASK)
 
         project.tasks.register<Copy>(makeTaskName(settings.copyLibrariesTaskPrefix, local)) {
@@ -60,6 +61,7 @@ class InstallTasksConfigurator(
 
         project.tasks.register<Copy>(makeTaskName(settings.installKernelTaskPrefix, local)) {
             dependsOn(cleanDirTask, shadowJar)
+            mustRunAfter(jarTask)
             group = groupName
             from(shadowJar.get().outputs)
             into(mainInstallPath.localJarsDir)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -118,6 +118,17 @@ tasks {
         addSingleValueFile("PUBLISHED_JUPYTER_API_VERSION", libs.versions.jupyterApi.get())
     }
 
+    whenTaskAdded {
+        val task = this
+        if (task is GenerateModuleMetadata && task.name == "generateMetadataFileForKernelPublication") {
+            task.dependsOn(shadowJar.get())
+        }
+    }
+
+    dokkaHtmlMultiModule {
+        mustRunAfter(shadowJar.get())
+    }
+
     publishDocs {
         docsRepoUrl.set(rootSettings.docsRepo)
         branchName.set("master")
diff --git a/docs/README.md b/docs/README.md
@@ -274,10 +274,8 @@ Other options are resolving library descriptor from a local file or from remote
  - default - Default imports: dataframe and Lets-Plot libraries
  - [exposed](https://github.com/JetBrains/Exposed) - Kotlin SQL framework
  - [fuel](https://github.com/kittinunf/fuel) - HTTP networking library
- - [ggdsl](https://github.com/AndreiKingsley/lib-ggdsl) - Lets-plot and Dataframe ggdsl
- - [ggdsl-dataframe](https://github.com/AndreiKingsley/lib-ggdsl) - Kotlin Dataframe integration for ggdsl
+ - [ggdsl](https://github.com/AndreiKingsley/lib-ggdsl) - Kotlin plotting DSL for Lets-Plot
  - [ggdsl-echarts](https://github.com/AndreiKingsley/lib-ggdsl) - Kotlin plotting DSL for Apache ECharts
- - [ggdsl-lets-plot](https://github.com/AndreiKingsley/lib-ggdsl) - Kotlin plotting DSL for Lets-Plot
  - [gral](https://github.com/eseifert/gral) - Java library for displaying plots
  - [jdsp](https://github.com/psambit9791/jDSP) - Java library for signal processing
  - [kalasim](https://www.kalasim.org) - Discrete event simulator
diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -29,3 +29,16 @@ which were used in this build.
 | 0.11.0.239     | 0.11.0-239              | 1.8.0            | 1.8.0                | 1.8.0                                 | 1.8                   | 1.8.0-1.0.8       |
 | 0.11.0.240     | 0.11.0-240              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
 | 0.11.0.248     | 0.11.0-248              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.302     | 0.11.0-302              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.311     | 0.11.0-311              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.312     | 0.11.0-312              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.314     | 0.11.0-314              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.315     | 0.11.0-315              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.316     | 0.11.0-316              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.317     | 0.11.0-317              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.318     | 0.11.0-318              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.319     | 0.11.0-319              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.320     | 0.11.0-320              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.321     | 0.11.0-321              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.322     | 0.11.0-322              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
+| 0.11.0.323     | 0.11.0-323              | 1.8.20-Beta      | 1.8.20-Beta          | 1.8.20-Beta                           | 1.8                   | 1.8.20-Beta-1.0.9 |
diff --git a/gradle.properties b/gradle.properties
@@ -18,6 +18,8 @@ librariesRepoUserAndName=Kotlin/kotlin-jupyter-libraries
 # Workaround for https://github.com/Kotlin/dokka/issues/1405
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m -Xmx2048m
 
+org.gradle.java.installations.auto-detect=false
+
 # Turn off README check when running check task
 skipReadmeCheck=false
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ jupyterNotebooksParser = "0.1.0-dev-1"
 
 ktlintGradle = "11.0.0"
 ktlint = "0.45.2"
-publishPlugin = "0.0.61-dev-33"
+publishPlugin = "1.8.10-dev-40"
 pluginPublishPlugin = "0.21.0"
 versionsPlugin = "0.44.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# 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"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/jupyter-lib/kotlin-jupyter-api-gradle-plugin/build.gradle.kts b/jupyter-lib/kotlin-jupyter-api-gradle-plugin/build.gradle.kts
@@ -29,6 +29,13 @@ dependencies {
     testImplementation(projects.apiAnnotations)
 }
 
+tasks.whenTaskAdded {
+    val task = this
+    if (task.name == "generateMetadataFileForPluginMavenPublication") {
+        task.setMustRunAfter(tasks.matching { it.name == "publishPluginJar" || it.name == "publishPluginJavaDocsJar" })
+    }
+}
+
 CreateResourcesTask.register(project, "saveVersion", tasks.processResources) {
     addSingleValueFile("VERSION", rootSettings.mavenVersion)
     addSingleValueFile("KOTLIN_VERSION", rootProject.defaultVersionCatalog.versions.devKotlin)
diff --git a/jupyter-lib/test-kit/build.gradle.kts b/jupyter-lib/test-kit/build.gradle.kts
@@ -16,9 +16,17 @@ dependencies {
     implementation(libs.test.kotlintest.assertions)
 }
 
+val rootShadowJar = ':' + build.SHADOW_JAR_TASK
+
 buildSettings {
     withLanguageLevel(rootSettings.kotlinLanguageLevel)
-    withTests()
+    withTests {
+        mustRunAfter(rootShadowJar)
+    }
+}
+
+tasks.dokkaHtmlPartial {
+    mustRunAfter(rootShadowJar)
 }
 
 kotlinPublications {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,10 @@
 
 rootProject.name = "kotlin-jupyter-kernel"
 
-enableFeaturePreview("VERSION_CATALOGS")
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 includeBuild("build-plugin")

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ sourceSets {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
	`30`	`+val myJvmTarget = libs.versions.jvmTarget.get()`
	`31`	`+val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()`
	`32`	`+`
`30`	`33`	`tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
`31`	`34`	`kotlinOptions {`
`32`	`35`	`apiVersion = "1.4"`
`@@ -35,7 +38,13 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
`35`	`38`	`@Suppress("SuspiciousCollectionReassignment")`
`36`	`39`	`freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")`
`37`	`40`
`38`		`- jvmTarget = libs.versions.jvmTarget.get()`
	`41`	`+ this.jvmTarget = myJvmTarget`
	`42`	`+ }`
	`43`	`+}`
	`44`	`+`
	`45`	`+java {`
	`46`	`+ toolchain {`
	`47`	`+ languageVersion.set(JavaLanguageVersion.of(myJvmTargetInt))`
`39`	`48`	`}`
`40`	`49`	`}`
`41`	`50`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,18 @@ dependencies {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
	`24`	`+val myJvmTarget = libs.versions.jvmTarget.get()`
	`25`	`+val myJvmTargetInt = myJvmTarget.substringAfter('.').toInt()`
	`26`	`+`
`24`	`27`	`tasks.withType<KotlinCompile> {`
`25`	`28`	`kotlinOptions {`
`26`		`- jvmTarget = libs.versions.jvmTarget.get()`
	`29`	`+ jvmTarget = myJvmTarget`
	`30`	`+ }`
	`31`	`+}`
	`32`	`+`
	`33`	`+java {`
	`34`	`+ toolchain {`
	`35`	`+ languageVersion.set(JavaLanguageVersion.of(myJvmTargetInt))`
`27`	`36`	`}`
`28`	`37`	`}`
`29`	`38`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import org.gradle.kotlin.dsl.withType`
`15`	`15`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`16`	`16`
`17`	`17`	`class BuildSettingsExtension(private val project: Project) {`
`18`		`- fun withTests() {`
	`18`	`+ fun withTests(configure: Test.() -> Unit = {}) {`
`19`	`19`	`val deps = project.defaultVersionCatalog.dependencies`
`20`	`20`
`21`	`21`	`project.dependencies {`
`@@ -30,6 +30,7 @@ class BuildSettingsExtension(private val project: Project) {`
`30`	`30`	`testLogging {`
`31`	`31`	`events("passed", "skipped", "failed")`
`32`	`32`	`}`
	`33`	`+ configure()`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`