Upgrade to Kotlin 2.0.20 (#410)

nebula-plugins · Oct 8, 2024 · 63d4817 · 63d4817
1 parent 6f583e5
commit 63d4817
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
 
 plugins {
     id 'com.netflix.nebula.plugin-plugin' version '21.2.0'
-    id "org.jetbrains.kotlin.jvm" version "1.8.0"
+    id "org.jetbrains.kotlin.jvm" version '2.0.20'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'java-gradle-plugin'
 }
@@ -178,11 +178,12 @@ tasks.withType(Test).configureEach {
 tasks.named('compileGroovy').configure {
     classpath = sourceSets.main.compileClasspath
 }
-tasks.named('compileKotlin').configure {
-    classpath += files(sourceSets.main.groovy.classesDirectory)
+tasks.named('compileKotlin') {
+    // Kotlin also depends on the result of Groovy compilation
+    // which automatically makes it depend of compileGroovy
+    libraries.from(files(sourceSets.main.groovy.classesDirectory))
 }
 
-
 ['compileClasspath', 'runtimeClasspath', 'testCompileClasspath', 'testRuntimeClasspath'].each { confName ->
     tasks.register("dependencyReport${confName.capitalize()}", DependencyReportTask) {
         configurations = [project.configurations.getByName(confName)] as Set

diff --git a/gradle.lockfile b/gradle.lockfile
@@ -3,30 +3,20 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
 com.google.guava:guava:19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.connector-factory:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.core:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.pageant:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.sshagent:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.usocket-jna:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
-com.jcraft:jsch.agentproxy.usocket-nc:0.0.7=integTestRuntimeClasspath,testRuntimeClasspath
 com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-contacts-plugin:7.0.0=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-info-plugin:12.1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-test:10.5.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-contacts-plugin:7.0.1=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-info-plugin:13.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-gradle-interop:2.1.1=integTestRuntimeClasspath
+com.netflix.nebula:nebula-gradle-interop:2.2.0=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-test:10.6.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
-com.trilead:trilead-ssh2:1.0.0-build220=integTestRuntimeClasspath,testRuntimeClasspath
 commons-lang:commons-lang:2.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-de.regnis.q.sequence:sequence-library:1.0.3=integTestRuntimeClasspath,testRuntimeClasspath
 dev.gradleplugins:gradle-api:7.6=compileClasspath
 javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
-joda-time:joda-time:2.12.5=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+joda-time:joda-time:2.13.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
-net.java.dev.jna:platform:3.4.0=integTestRuntimeClasspath,testRuntimeClasspath
-org.antlr:antlr-runtime:3.4=integTestRuntimeClasspath,testRuntimeClasspath
+net.java.dev.jna:jna-platform:5.15.0=integTestRuntimeClasspath,testRuntimeClasspath
+net.java.dev.jna:jna:5.15.0=integTestRuntimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.8.1=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-artifact:3.8.3=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-builder-support:3.8.3=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
@@ -45,24 +35,21 @@ org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r=compileClasspath,runtimeC
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=integTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=integTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.0.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.9.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-engine:1.9.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.multiverse:multiverse-core:0.7.0=compileClasspath,runtimeClasspath,shadow,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-commons:9.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-commons:9.7.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-tree:5.2=integTestCompileClasspath,integTestRuntimeClasspath
-org.ow2.asm:asm-tree:9.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-tree:9.7.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-util:5.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm:5.2=integTestCompileClasspath,integTestRuntimeClasspath
-org.ow2.asm:asm:9.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm:9.7.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.3-groovy-3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-junit4:2.3-groovy-3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.tmatesoft.sqljet:sqljet:1.1.10=integTestRuntimeClasspath,testRuntimeClasspath
-org.tmatesoft.svnkit:svnkit:1.8.12=integTestRuntimeClasspath,testRuntimeClasspath
 empty=annotationProcessor,compile,integTestAnnotationProcessor,integTestCompile,integTestCompileOnly,integTestRuntime,runtime,testAnnotationProcessor,testCompile,testCompileOnly,testRuntime