Skip to content

Commit f5359de

Browse files
CristianGMSpace Team
authored and
Space Team
committed
compiler-test-convention: disable compileTestsExtension for JPS
1 parent 671f1b4 commit f5359de

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

repo/gradle-build-conventions/compiler-tests-convention/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ kotlin {
2727
dependencies {
2828
implementation(kotlin("stdlib", embeddedKotlinVersion))
2929

30+
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
3031
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
3132
implementation("org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}")
3233
implementation("org.jetbrains.kotlin:kotlin-reflect:${project.bootstrapKotlinVersion}")

repo/gradle-build-conventions/compiler-tests-convention/src/main/kotlin/CompilerTestsExtension.kt

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import org.gradle.api.Project
77
import org.gradle.api.artifacts.Configuration
8+
import org.gradle.api.artifacts.ProjectDependency
9+
import org.gradle.api.artifacts.dsl.DependencyHandler
810
import org.gradle.kotlin.dsl.dependencies
911
import org.gradle.kotlin.dsl.project
1012

@@ -40,45 +42,50 @@ abstract class CompilerTestsExtension(private val project: Project) {
4042
isTransitive = false
4143
}
4244

45+
private val noOp = project.kotlinBuildProperties.isInJpsBuildIdeaSync
46+
private fun add(configuration: Configuration, dependency: DependencyHandler.() -> ProjectDependency) {
47+
if (!noOp) {
48+
project.dependencies { configuration(dependency(this)) }
49+
}
50+
}
51+
4352
init {
4453
project.dependencies {
45-
stdlibRuntimeForTests(project(":kotlin-stdlib"))
46-
stdlibMinimalRuntimeForTests(project(":kotlin-stdlib-jvm-minimal-for-test"))
47-
kotlinReflectJarForTests(project(":kotlin-reflect"))
54+
add(stdlibRuntimeForTests) { project(":kotlin-stdlib") }
55+
add(stdlibMinimalRuntimeForTests) { project(":kotlin-stdlib-jvm-minimal-for-test") }
56+
add(kotlinReflectJarForTests) { project(":kotlin-reflect") }
4857
}
4958
}
5059

5160
fun withStdlibCommon() {
52-
project.dependencies { stdlibCommonRuntimeForTests(project(":kotlin-stdlib-common")) }
61+
add(stdlibCommonRuntimeForTests) { project(":kotlin-stdlib-common") }
5362
}
5463

5564
fun withScriptRuntime() {
56-
project.dependencies { scriptRuntimeForTests(project(":kotlin-script-runtime")) }
65+
add(scriptRuntimeForTests) { project(":kotlin-script-runtime") }
5766
}
5867

5968
fun withTestJar() {
60-
project.dependencies { kotlinTestJarForTests(project(":kotlin-test")) }
69+
add(kotlinTestJarForTests) { project(":kotlin-test") }
6170
}
6271

6372
fun withAnnotations() {
64-
project.dependencies { kotlinAnnotationsForTests(project(":kotlin-annotations-jvm")) }
73+
add(kotlinAnnotationsForTests) { project(":kotlin-annotations-jvm") }
6574
}
6675

6776
fun withStdlibJsRuntime() {
68-
project.dependencies { stdlibJsRuntimeForTests(project(":kotlin-stdlib", "distJsKlib")) }
77+
add(stdlibJsRuntimeForTests) { project(":kotlin-stdlib", "distJsKlib") }
6978
}
7079

7180
fun withTestJsRuntime() {
72-
project.dependencies { testJsRuntimeForTests(project(":kotlin-test", "jsRuntimeElements")) }
81+
add(testJsRuntimeForTests) { project(":kotlin-test", "jsRuntimeElements") }
7382
}
7483

7584
fun withScriptingPlugin() {
76-
project.dependencies {
77-
scriptingPluginForTests(project(":kotlin-scripting-compiler"))
78-
scriptingPluginForTests(project(":kotlin-scripting-compiler-impl"))
79-
scriptingPluginForTests(project(":kotlin-scripting-common"))
80-
scriptingPluginForTests(project(":kotlin-scripting-jvm"))
81-
}
85+
add(scriptingPluginForTests) { project(":kotlin-scripting-compiler") }
86+
add(scriptingPluginForTests) { project(":kotlin-scripting-compiler-impl") }
87+
add(scriptingPluginForTests) { project(":kotlin-scripting-common") }
88+
add(scriptingPluginForTests) { project(":kotlin-scripting-jvm") }
8289
/*
8390
KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR
8491
KOTLIN_SCRIPTING_COMPILER_IMPL_JAR

0 commit comments

Comments
 (0)