kotlin2cpg: bump compiler version to 1.9.0 (#3059)

the K2 compiler is still in heavy development, that is, we want the latest version to be used for as long as it needs to come out of beta. 1.9.0 was released a few hours ago
joernio · Jul 6, 2023 · 733716a · 733716a
1 parent 508f043
commit 733716a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/joern-cli/frontends/kotlin2cpg/build.sbt b/joern-cli/frontends/kotlin2cpg/build.sbt
@@ -1,6 +1,6 @@
 name := "kotlin2cpg"
 
-val kotlinVersion = "1.8.21"
+val kotlinVersion = "1.9.0"
 
 dependsOn(
   Projects.dataflowengineoss,

diff --git a/joern-cli/frontends/kotlin2cpg/src/main/resources/jars/kotlin-stdlib-1.8.21.jar b/joern-cli/frontends/kotlin2cpg/src/main/resources/jars/kotlin-stdlib-1.8.21.jar
diff --git a/joern-cli/frontends/kotlin2cpg/src/main/resources/jars/kotlin-stdlib-1.9.0.jar b/joern-cli/frontends/kotlin2cpg/src/main/resources/jars/kotlin-stdlib-1.9.0.jar
diff --git a/...rces/jars/kotlin-stdlib-common-1.8.21.jar → ...urces/jars/kotlin-stdlib-common-1.9.0.jar b/...rces/jars/kotlin-stdlib-common-1.8.21.jar → ...urces/jars/kotlin-stdlib-common-1.9.0.jar
diff --git a/...ources/jars/kotlin-stdlib-jdk8-1.8.21.jar → ...sources/jars/kotlin-stdlib-jdk8-1.9.0.jar b/...ources/jars/kotlin-stdlib-jdk8-1.8.21.jar → ...sources/jars/kotlin-stdlib-jdk8-1.9.0.jar
diff --git a/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/Kotlin2Cpg.scala b/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/Kotlin2Cpg.scala
@@ -36,9 +36,9 @@ class Kotlin2Cpg extends X2CpgFrontend[Config] with UsesService {
   protected val logger = LoggerFactory.getLogger(getClass)
   val parsingError     = "KOTLIN2CPG_PARSING_ERROR"
   private val defaultKotlinStdlibContentRootJarPaths = Seq(
-    DefaultContentRootJarPath("jars/kotlin-stdlib-1.8.21.jar", isResource = true),
-    DefaultContentRootJarPath("jars/kotlin-stdlib-common-1.8.21.jar", isResource = true),
-    DefaultContentRootJarPath("jars/kotlin-stdlib-jdk8-1.8.21.jar", isResource = true)
+    DefaultContentRootJarPath("jars/kotlin-stdlib-1.9.0.jar", isResource = true),
+    DefaultContentRootJarPath("jars/kotlin-stdlib-common-1.9.0.jar", isResource = true),
+    DefaultContentRootJarPath("jars/kotlin-stdlib-jdk8-1.9.0.jar", isResource = true)
   )
 
   def createCpg(config: Config): Try[Cpg] = {

diff --git a/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/compiler/CompilerAPI.scala b/joern-cli/frontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/compiler/CompilerAPI.scala
@@ -29,7 +29,7 @@ object CompilerAPI {
     val config = new CompilerConfiguration()
     config.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
     forDirectories.foreach { p =>
-      config.add(CLIConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(p, true))
+      config.add(CLIConfigurationKeys.CONTENT_ROOTS, new KotlinSourceRoot(p, true, null))
     }
 
     val javaHome = File(System.getProperty("java.home"))

diff --git a/...i/frontends/kotlin2cpg/src/test/scala/io/joern/kotlin2cpg/compiler/CompilerAPITests.scala b/...i/frontends/kotlin2cpg/src/test/scala/io/joern/kotlin2cpg/compiler/CompilerAPITests.scala
@@ -41,9 +41,9 @@ class CompilerAPITests extends AnyFreeSpec with Matchers {
 
     "should not receive a compiler error message when the dependencies of the project have been provided" in {
       val jarResources = Seq(
-        DefaultContentRootJarPath("jars/kotlin-stdlib-1.8.21.jar", isResource = true),
-        DefaultContentRootJarPath("jars/kotlin-stdlib-common-1.8.21.jar", isResource = true),
-        DefaultContentRootJarPath("jars/kotlin-stdlib-jdk8-1.8.21.jar", isResource = true)
+        DefaultContentRootJarPath("jars/kotlin-stdlib-1.9.0.jar", isResource = true),
+        DefaultContentRootJarPath("jars/kotlin-stdlib-common-1.9.0.jar", isResource = true),
+        DefaultContentRootJarPath("jars/kotlin-stdlib-jdk8-1.9.0.jar", isResource = true)
       )
 
       val defaultContentRootJarsDir = File(projectDependenciesPath)