Skip to content

Commit d5240e7

Browse files
authored
Merge pull request #551 from sourcegraph/nsc/lsif-kotlin-inprocess
run kotlin compiler-inprocess and bump semanticdb-kotlin version
2 parents bd1f069 + c5dc30e commit d5240e7

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lazy val V =
2020
def scala3 = "3.2.2"
2121
def metals = "0.11.11"
2222
def scalameta = "4.7.6"
23-
def semanticdbKotlinc = "0.2.0"
23+
def semanticdbKotlinc = "0.3.0"
2424
def testcontainers = "0.39.3"
2525
def requests = "0.6.5"
2626
def minimalMillVersion = "0.10.0"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.sourcegraph.io.DeleteVisitor
1010
import com.sourcegraph.scip_java.BuildInfo
1111
import com.sourcegraph.scip_java.Embedded
1212
import com.sourcegraph.scip_java.commands.IndexCommand
13+
import org.intellij.lang.annotations.Language
1314
import os.CommandResult
1415

1516
class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
@@ -73,7 +74,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
7374
val script = initScript(toolchains, toolchains.tmp).toString
7475
val buildCommand = ListBuffer.empty[String]
7576
buildCommand += toolchains.gradleCommand
76-
buildCommand += s"--no-daemon"
77+
buildCommand += "--no-daemon"
7778
buildCommand += "--init-script"
7879
buildCommand += script
7980
if (toolchains.toolchains.nonEmpty) {
@@ -82,6 +83,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
8283
buildCommand +=
8384
s"-Porg.gradle.java.installations.paths=${toolchains.paths()}"
8485
}
86+
buildCommand += "-Pkotlin.compiler.execution.strategy=in-process"
8587
buildCommand ++=
8688
index.finalBuildCommand(
8789
List[Option[String]](
@@ -146,6 +148,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
146148
val dependenciesPath = targetroot.resolve("dependencies.txt")
147149
val kotlinSemanticdbVersion = BuildInfo.semanticdbKotlincVersion
148150
Files.deleteIfExists(dependenciesPath)
151+
@Language("Groovy")
149152
val script =
150153
s"""|allprojects {
151154
| gradle.projectsEvaluated {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import scala.jdk.CollectionConverters._
99

1010
import com.sourcegraph.scip_java.Embedded
1111
import com.sourcegraph.scip_java.commands.IndexCommand
12+
import org.intellij.lang.annotations.Language
1213

1314
case class GradleJavaToolchains(
1415
toolchains: List[GradleJavaCompiler],
@@ -82,6 +83,7 @@ object GradleJavaToolchains {
8283
.resolve("kotlin-multiplatform-enabled.txt")
8384
val gradleVersionPath = tmp.resolve("gradle-version.txt")
8485
val taskName = "scipDetectJavaToolchains"
86+
@Language("Groovy")
8587
val script =
8688
s"""|
8789
|try {

0 commit comments

Comments
 (0)