Drop support for Kotlin 1, only support Kotlin 2.1

Author: antonsviridov-src

build.sbt

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

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

@@ -100,7 +100,6 @@ 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
     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.semanticdbKotlinc2Version}"
+            s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlincVersion}"
           ),
           transitive = false
         )

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

@@ -333,13 +333,14 @@ class SemanticdbGradlePlugin extends Plugin[Project] {
                     def getKotlinOptions(): {
                       def getFreeCompilerArgs(): ju.List[String]
                       def setFreeCompilerArgs(args: ju.List[String]): Unit
+                      // def getLanguageVersion(): Any
                     }
                   }
                 ]
                 .getKotlinOptions()
 
               val semanticdbkotlincDependency =
-                s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlinc1Version}"
+                s"com.sourcegraph:semanticdb-kotlinc:${BuildInfo.semanticdbKotlincVersion}"
 
               val semanticdbKotlinc =
                 project

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

@@ -360,32 +360,6 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
     gradleVersions = List(Gradle8, Gradle7, Gradle6),
     tools = List(Scala2_12_12)
   )
-  checkGradleBuild(
-    "kotlin",
-    """|/build.gradle
-       |plugins {
-       |    id 'org.jetbrains.kotlin.jvm' version '1.8.0'
-       |}
-       |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(Gradle6, Gradle7)
-  )
-
   checkGradleBuild(
     "kotlin2",
     """|/build.gradle
@@ -465,7 +439,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
       s"""|/build.gradle
           |plugins {
           |    id 'java'
-          |    id 'org.jetbrains.kotlin.jvm' version '1.8.0'
+          |    id 'org.jetbrains.kotlin.jvm' version '2.1.20'
           |}
           |java {
           |  toolchain {
@@ -478,9 +452,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
           |object Example {}
           |""".stripMargin,
       expectedSemanticdbFiles = 1,
-      // Older Kotlin gradle plugins don't support Gradle 8:
-      // https://youtrack.jetbrains.com/issue/KT-55704/Cannot-use-TaskAction-annotation-on-method-AbstractKotlinCompile.execute-error-while-using-Gradle-8.0-rc-with-KGP-1.5.32
-      gradleVersions = List(Gradle6, Gradle7)
+      gradleVersions = List(Gradle8)
     )
   }
 
@@ -490,7 +462,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
         s"kotlin-multiplatform-$jvmSettings",
         s"""|/build.gradle
             |plugins {
-            |    id 'org.jetbrains.kotlin.multiplatform' version '1.8.0'
+            |    id 'org.jetbrains.kotlin.multiplatform' version '2.1.20'
             |}
             |repositories {
             |    mavenCentral()