WIP

Author: antonsviridov-src

build.sbt

@@ -23,7 +23,11 @@ lazy val V =
     val scala3 = "3.3.3"
     val metals = "1.2.2"
     val scalameta = "4.9.3"
-    val semanticdbKotlinc = "0.4.0"
+    // val semanticdbKotlinc = "0.4.1-SNAPSHOT"
+    val semanticdbKotlinc = new {
+      val forKotlin1 = "0.4.0"
+      val forKotlin2 = "dev-SNAPSHOT"
+    }
     val testcontainers = "0.39.3"
     val requests = "0.8.0"
     val minimalMillVersion = "0.10.0"
@@ -138,7 +142,8 @@ lazy val gradlePlugin = project
         "sbtSourcegraphVersion" ->
           com.sourcegraph.sbtsourcegraph.BuildInfo.version,
         "semanticdbVersion" -> V.scalameta,
-        "semanticdbKotlincVersion" -> V.semanticdbKotlinc,
+        "semanticdbKotlinc1Version" -> V.semanticdbKotlinc.forKotlin1,
+        "semanticdbKotlinc2Version" -> V.semanticdbKotlinc.forKotlin2,
         "mtagsVersion" -> V.metals,
         "scala211" -> V.scala211,
         "scala212" -> V.scala212,
@@ -266,7 +271,8 @@ lazy val cli = project
         "sbtSourcegraphVersion" ->
           com.sourcegraph.sbtsourcegraph.BuildInfo.version,
         "semanticdbVersion" -> V.scalameta,
-        "semanticdbKotlincVersion" -> V.semanticdbKotlinc,
+        "semanticdbKotlinc1Version" -> V.semanticdbKotlinc.forKotlin1,
+        "semanticdbKotlinc2Version" -> V.semanticdbKotlinc.forKotlin2,
         "mtagsVersion" -> V.metals,
         "scala211" -> V.scala211,
         "scala212" -> V.scala212,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.10
+sbt.version=1.11.2

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.14")
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala

@@ -100,7 +100,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
     val pluginpath = Embedded.semanticdbJar(tmp)
     val gradlePluginPath = Embedded.gradlePluginJar(tmp)
     val dependenciesPath = targetroot.resolve("dependencies.txt")
-    val kotlinSemanticdbVersion = BuildInfo.semanticdbKotlincVersion
+    // val kotlinSemanticdbVersion = BuildInfo.semanticdbKotlincVersion
     Files.deleteIfExists(dependenciesPath)
 
     val script =

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala

@@ -240,7 +240,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
       Dependencies
         .resolveDependencies(
           List(
-            s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlincVersion}"
+            s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlinc2Version}"
           ),
           transitive = false
         )

semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala

@@ -339,7 +339,7 @@ class SemanticdbGradlePlugin extends Plugin[Project] {
                 .getKotlinOptions()
 
               val semanticdbkotlincDependency =
-                s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlincVersion}"
+                s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlinc1Version}"
 
               val semanticdbKotlinc =
                 project

tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala

@@ -386,6 +386,33 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
     gradleVersions = List(Gradle6, Gradle7)
   )
 
+  checkGradleBuild(
+    "kotlin2",
+    """|/build.gradle
+       |plugins {
+       |    id 'org.jetbrains.kotlin.jvm' version '2.1.20'
+       |}
+       |repositories {
+       |    mavenCentral()
+       |}
+       |/src/main/java/foo/JExample.java
+       |package foo;
+       |public class JExample {}
+       |/src/main/kotlin/foo/Example.kt
+       |package foo
+       |object Example {}
+       |/src/test/java/foo/JExampleSuite.java
+       |package foo;
+       |public class JExampleSuite {}
+       |/src/test/kotlin/foo/ExampleSuite.kt
+       |package foo
+       |class ExampleSuite {}
+       |""".stripMargin,
+    expectedSemanticdbFiles = 4,
+    gradleVersions = List(Gradle8)
+  )
+
+
   checkGradleBuild(
     "implementation-deps",
     """|/settings.gradle