Skip to content

Commit 101a77f

Browse files
demiurg906Space Cloud
authored andcommitted
[Build] Specify that testGenerator depends on the testFixtures sourceset
1 parent dfb4f88 commit 101a77f

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

compiler/tests-spec/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,9 @@ projectTests {
6161
}
6262
}
6363

64-
testGenerator("org.jetbrains.kotlin.spec.utils.tasks.GenerateSpecTestsKt", taskName = "generateSpecTests")
64+
testGenerator(
65+
"org.jetbrains.kotlin.spec.utils.tasks.GenerateSpecTestsKt",
66+
taskName = "generateSpecTests",
67+
doNotSetFixturesSourceSetDependency = true,
68+
)
6569
}

jps/jps-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ projectTests {
138138
)
139139
}
140140

141-
testGenerator("org.jetbrains.kotlin.jps.GenerateJpsPluginTestsKt") {
141+
testGenerator("org.jetbrains.kotlin.jps.GenerateJpsPluginTestsKt", doNotSetFixturesSourceSetDependency = true) {
142142
javaLauncher.set(
143143
javaToolchains.launcherFor {
144144
languageVersion.set(JavaLanguageVersion.of(17))

libraries/tools/kotlinp/jvm/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ projectTests {
4949
workingDir = rootDir
5050
}
5151

52-
testGenerator("org.jetbrains.kotlin.kotlinp.jvm.test.GenerateKotlinpTestsKt")
52+
testGenerator("org.jetbrains.kotlin.kotlinp.jvm.test.GenerateKotlinpTestsKt", doNotSetFixturesSourceSetDependency = true)
5353

5454
withJvmStdlibAndReflect()
5555
}

plugins/atomicfu/atomicfu-compiler/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ projectTests {
237237
jvmArgs("--add-opens=java.base/java.io=ALL-UNNAMED")
238238
}
239239

240-
testGenerator("org.jetbrains.kotlin.generators.tests.GenerateAtomicfuTestsKt") {
240+
testGenerator("org.jetbrains.kotlin.generators.tests.GenerateAtomicfuTestsKt", doNotSetFixturesSourceSetDependency = true) {
241241
javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
242242
dependsOn(":compiler:generateTestData")
243243
}

plugins/compose/compiler-hosted/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ projectTests {
135135
useJsIrBoxTests(version = version, buildDir = layout.buildDirectory)
136136
}
137137

138-
testGenerator("androidx.compose.compiler.plugins.kotlin.TestGeneratorKt")
138+
testGenerator("androidx.compose.compiler.plugins.kotlin.TestGeneratorKt", doNotSetFixturesSourceSetDependency = true)
139139

140140
withJvmStdlibAndReflect()
141141
withStdlibJsRuntime()

plugins/js-plain-objects/compiler-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ projectTests {
9292
}
9393
}
9494

95-
testGenerator("org.jetbrains.kotlinx.jspo.TestGeneratorKt")
95+
testGenerator("org.jetbrains.kotlinx.jspo.TestGeneratorKt", doNotSetFixturesSourceSetDependency = true)
9696
}

repo/gradle-build-conventions/project-tests-convention/src/main/kotlin/ProjectTestsExtension.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,21 @@ abstract class ProjectTestsExtension(val project: Project) {
220220
}
221221
}
222222

223+
/**
224+
* [doNotSetFixturesSourceSetDependency] exits only for a migration period and used in projects which are not migrated to `testFixtures` yet.
225+
* Please don't use set it to `true` for new generator tasks.
226+
*/
223227
fun testGenerator(
224228
fqName: String,
225229
taskName: String = "generateTests",
226-
sourceSet: SourceSet? = null,
230+
doNotSetFixturesSourceSetDependency: Boolean = false,
227231
configure: JavaExec.() -> Unit = {}
228232
) {
229-
project.generator(taskName, fqName, sourceSet, configure)
233+
val fixturesSourceSet = if (doNotSetFixturesSourceSetDependency) {
234+
null
235+
} else {
236+
project.sourceSets.named("testFixtures").get()
237+
}
238+
project.generator(taskName, fqName, fixturesSourceSet, configure)
230239
}
231240
}

0 commit comments

Comments
 (0)