scip-kotlinc Kotlin update, fixes and improvements

.github/workflows/repos.yaml

@@ -98,33 +98,33 @@ jobs:
             bazel_version: ""
             covers: Gradle, Java project target 21, Java 21 runtime
 
-          - name: gradle-kotlin-okio
-            repository: square/okio
-            ref: parent-3.16.0
+          - name: gradle-kotlin-kotlinpoet
+            repository: square/kotlinpoet
+            ref: 0182a25089ee1f4f2378568b497f82a8ebc3017d
             directory: .
             build_tool: gradle
-            build_command: "-Dkjs=false -Dkwasm=false :okio:compileKotlinJvm"
+            build_command: "-Dkjs=false -Dkwasm=false compileKotlinJvm"
             java: 17
             bazel_version: ""
-            covers: Gradle, Kotlin, Kotlin 2.2.0
+            covers: Gradle, Kotlin, Kotlin 2.4.0
 
-          - name: gradle-kotlin-flowext
-            repository: hoc081098/FlowExt
-            ref: 7341f3853d670af0283258f57643a68ed273f8ac
+          - name: gradle-kotlin-kotlinconf-app
+            repository: JetBrains/kotlinconf-app
+            ref: b5b0c8b4bb4476a59673dd857b598ef586100f52
             directory: .
             build_tool: gradle
             build_command: "compileKotlinJvm"
-            java: 17
+            java: 25
             bazel_version: ""
             expected_language: kotlin
-            covers: Gradle, Kotlin multiplatform JVM target, Kotlin 2.2.0, Java 17 runtime
+            covers: Gradle, Kotlin multiplatform JVM target, Kotlin 2.4.0, Java 25 runtime
 
-          - name: gradle-mixed-okio-jmh
-            repository: square/okio
-            ref: parent-3.16.0
+          - name: gradle-mixed-kotlinpoet
+            repository: square/kotlinpoet
+            ref: 0182a25089ee1f4f2378568b497f82a8ebc3017d
             directory: .
             build_tool: gradle
-            build_command: "-Dkjs=false -Dkwasm=false :okio:jvm:jmh:jmhClasses"
+            build_command: "-Dkjs=false -Dkwasm=false compileKotlinJvm compileJava"
             java: 21
             bazel_version: ""
             covers: Gradle, mixed Java/Kotlin, Java 21 runtime

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 clikt = "5.1.0"
 gradle-api = "8.11.1"
 junit-jupiter = "5.11.4"
-kctfork = "0.7.1"
+kctfork = "0.13.0"
 kotest = "6.2.1"
-kotlin = "2.2.0"
+kotlin = "2.4.0"
 kotlinx-serialization = "1.11.0"
 lombok = "1.18.46"
 maven-plugin-annotations = "3.15.2"

scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/ScipGradlePlugin.java

@@ -3,11 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.initialization.Settings;
+import org.gradle.api.internal.GradleInternal;
 import org.gradle.api.tasks.compile.JavaCompile;
 
 public class ScipGradlePlugin implements Plugin<Project> {
@@ -18,18 +19,18 @@ public void apply(Project project) {
   }
 
   private void configureProject(Project project) {
-    // Inject Maven Central/local so the indexer (and plugins like protobuf that
-    // resolve their own artifacts) can resolve dependencies even when the build
-    // being indexed doesn't declare any repositories of its own.
-    try {
+    // See https://github.com/gradle/gradle/issues/27260
+    Settings settings = ((GradleInternal) (project.getGradle())).getSettings();
+
+    if (settings.getDependencyResolutionManagement().getRepositories().isEmpty()) {
+      // Inject Maven Central/local so the indexer (and plugins like protobuf that
+      // resolve their own artifacts) can resolve dependencies even when the build
+      // being indexed doesn't declare any repositories of its own.
       project.getRepositories().add(project.getRepositories().mavenCentral());
       project.getRepositories().add(project.getRepositories().mavenLocal());
-    } catch (InvalidUserCodeException exc) {
-      // FAIL_ON_PROJECT_REPOS forbids project repositories; they are declared
-      // in settings instead, so the injection isn't needed (issue #847).
-      project
-          .getLogger()
-          .info("scip-java: not injecting Maven Central/local repositories: " + exc.getMessage());
+    } else {
+      // repositories are declared in settings instead, so the injection isn't needed (issue #847).
+      project.getLogger().info("scip-java: not injecting Maven Central/local repositories");
     }
 
     Map<String, Object> extraProperties =

scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '2.2.0'
+    id 'org.jetbrains.kotlin.jvm' version '2.4.0'
 }
 java {
   toolchain {

scip-java/src/test/resources/fixtures/gradle/kotlin2/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '2.2.0'
+    id 'org.jetbrains.kotlin.jvm' version '2.4.0'
 }
 kotlin {
     jvmToolchain(17)

scip-kotlinc/build.gradle.kts

@@ -24,10 +24,6 @@ dependencies {
     testImplementation(libs.kctfork.core)
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    compilerOptions.freeCompilerArgs.add("-Xcontext-parameters")
-}
-
 tasks.named<Test>("test") {
     maxHeapSize = "2g"
 }