Skip to content

Commit 582c898

Browse files
authored
Merge pull request #58 from sourcegraph/nsc/debug-project-ootb
configure debug-project to use jar from :semanticdb-kotlinc:shadowJar
2 parents cf6fc09 + 2487965 commit 582c898

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.palantir.gradle.gitversion.VersionDetails
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import groovy.lang.Closure
4+
import org.gradle.jvm.toolchain.internal.CurrentJvmToolchainSpec
45

56
plugins {
67
kotlin("jvm") version "1.5.30"

debug-project/build.gradle.kts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
import java.nio.file.Files
3-
import java.nio.file.Paths
4-
import kotlin.collections.mapOf
52

63
plugins {
74
kotlin("jvm")
@@ -20,8 +17,24 @@ val semanticdbJar: Configuration by configurations.creating {
2017

2118
dependencies {
2219
implementation(kotlin("stdlib"))
23-
semanticdbJar(project(mapOf(
24-
"path" to ":" + projects.semanticdbKotlinc.name,
25-
"configuration" to "semanticdbJar"
26-
)))
20+
semanticdbJar(project(
21+
path = ":${projects.semanticdbKotlinc.name}",
22+
configuration = "semanticdbJar"
23+
))
2724
}
25+
26+
tasks.withType<KotlinCompile> {
27+
kotlinOptions.jvmTarget = "1.8"
28+
dependsOn(":${projects.semanticdbKotlinc.name}:shadowJar")
29+
val targetroot = File(project.buildDir, "semanticdb-targetroot")
30+
kotlinOptions {
31+
jvmTarget = "11"
32+
freeCompilerArgs = freeCompilerArgs + listOf(
33+
"-Xplugin=${semanticdbJar.first()}",
34+
"-P",
35+
"plugin:semanticdb-kotlinc:sourceroot=${projectDir.path}",
36+
"-P",
37+
"plugin:semanticdb-kotlinc:targetroot=${targetroot}"
38+
)
39+
}
40+
}

semanticdb-kotlinc/build.gradle.kts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import java.net.URI
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
43
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
54
import org.gradle.api.publish.maven.MavenPublication
65

@@ -50,30 +49,23 @@ dependencies {
5049
}
5150

5251
tasks.withType<KotlinCompile> {
53-
dependsOn(projects.semanticdbKotlin.dependencyProject.tasks.build.get().path)
52+
dependsOn(":${projects.semanticdbKotlin.name}:build")
5453
kotlinOptions {
5554
freeCompilerArgs = freeCompilerArgs + listOf("-Xinline-classes")
5655
}
5756
}
5857

5958
val semanticdbJar: Configuration by configurations.creating {
60-
afterEvaluate {
61-
isCanBeConsumed = true
62-
isCanBeResolved = false
63-
outgoing.artifact(tasks.shadowJar.get().outputs.files.first())
64-
}
59+
isCanBeConsumed = true
60+
isCanBeResolved = false
6561
}
6662

6763
artifacts {
68-
afterEvaluate {
69-
add("semanticdbJar", tasks.shadowJar.get().outputs.files.first()) {
70-
builtBy(tasks.shadowJar)
71-
}
72-
}
64+
add(semanticdbJar.name, tasks.shadowJar)
7365
}
7466

7567
tasks.jar {
76-
archiveClassifier.set("-slim")
68+
archiveClassifier.set("slim")
7769
manifest {
7870
attributes["Specification-Title"] = project.name
7971
attributes["Specification-Version"] = project.version

0 commit comments

Comments
 (0)