Skip to content

Commit f78eda6

Browse files
demiurg906Space Team
demiurg906
authored and
Space Team
committed
[Build] Migrate projectTest usages to project-tests-convention plugin
1 parent 63c0fd1 commit f78eda6

File tree

86 files changed

+965
-756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+965
-756
lines changed

‎analysis/analysis-api-fe10/build.gradle.kts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
kotlin("jvm")
55
id("jps-compatible")
66
id("java-test-fixtures")
7+
id("project-tests-convention")
78
}
89

910
dependencies {
@@ -60,10 +61,13 @@ tasks.withType<KotlinJvmCompile>().configureEach {
6061

6162
optInToK1Deprecation()
6263

63-
projectTest(jUnitMode = JUnitMode.JUnit5) {
64-
dependsOn(":dist")
65-
workingDir = rootDir
66-
useJUnitPlatform()
64+
projectTests {
65+
testTask(jUnitMode = JUnitMode.JUnit5) {
66+
dependsOn(":dist")
67+
workingDir = rootDir
68+
}
69+
70+
withJvmStdlibAndReflect()
6771
}
6872

6973
testsJar()

‎analysis/analysis-api-fir/build.gradle.kts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id("jps-compatible")
66
id("generated-sources")
77
id("java-test-fixtures")
8+
id("project-tests-convention")
89
}
910

1011
dependencies {
@@ -73,14 +74,18 @@ sourceSets {
7374

7475
optInToUnsafeDuringIrConstructionAPI()
7576

76-
projectTest(
77-
jUnitMode = JUnitMode.JUnit5,
78-
defineJDKEnvVariables = listOf(JdkMajorVersion.JDK_11_0)
79-
) {
80-
dependsOn(":dist")
81-
workingDir = rootDir
82-
useJUnitPlatform()
83-
}.also { confugureFirPluginAnnotationsDependency(it) }
77+
projectTests {
78+
testTask(
79+
jUnitMode = JUnitMode.JUnit5,
80+
defineJDKEnvVariables = listOf(JdkMajorVersion.JDK_11_0)
81+
) {
82+
dependsOn(":dist")
83+
workingDir = rootDir
84+
useJUnitPlatform()
85+
}.also { confugureFirPluginAnnotationsDependency(it) }
86+
87+
withJvmStdlibAndReflect()
88+
}
8489

8590
testsJar()
8691

‎analysis/analysis-api-standalone/analysis-api-standalone-native/build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.kotlinNativeDist
22

33
plugins {
44
kotlin("jvm")
5+
id("project-tests-convention")
56
}
67

78
dependencies {
@@ -25,10 +26,11 @@ sourceSets {
2526
}
2627

2728

28-
projectTest(jUnitMode = JUnitMode.JUnit5) {
29-
dependsOn(":dist")
30-
workingDir = rootDir
31-
useJUnitPlatform()
29+
projectTests {
30+
testTask(jUnitMode = JUnitMode.JUnit5) {
31+
dependsOn(":dist")
32+
workingDir = rootDir
33+
}
3234
}
3335

3436
val test by nativeTest("test", null) {

‎analysis/analysis-api-standalone/build.gradle.kts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
kotlin("jvm")
33
id("jps-compatible")
44
id("java-test-fixtures")
5+
id("project-tests-convention")
56
}
67

78
dependencies {
@@ -45,10 +46,13 @@ sourceSets {
4546
"testFixtures" { projectDefault() }
4647
}
4748

48-
projectTest(jUnitMode = JUnitMode.JUnit5, defineJDKEnvVariables = listOf(JdkMajorVersion.JDK_11_0)) {
49-
dependsOn(":dist")
50-
workingDir = rootDir
51-
useJUnitPlatform()
52-
}.also { confugureFirPluginAnnotationsDependency(it) }
49+
projectTests {
50+
testTask(jUnitMode = JUnitMode.JUnit5, defineJDKEnvVariables = listOf(JdkMajorVersion.JDK_11_0)) {
51+
dependsOn(":dist")
52+
workingDir = rootDir
53+
}.also { confugureFirPluginAnnotationsDependency(it) }
54+
55+
withJvmStdlibAndReflect()
56+
}
5357

5458
testsJar()

‎analysis/analysis-api/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
kotlin("jvm")
55
id("jps-compatible")
66
id("org.jetbrains.kotlinx.binary-compatibility-validator")
7+
id("project-tests-convention")
78
}
89

910
kotlin {
@@ -55,7 +56,10 @@ apiValidation {
5556

5657
testsJar()
5758

58-
projectTest(jUnitMode = JUnitMode.JUnit5) {
59-
workingDir = rootDir
60-
useJUnitPlatform()
59+
projectTests {
60+
testTask(jUnitMode = JUnitMode.JUnit5) {
61+
workingDir = rootDir
62+
}
63+
64+
withJvmStdlibAndReflect()
6165
}

‎analysis/analysis-test-framework/build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
kotlin("jvm")
55
id("jps-compatible")
66
id("java-test-fixtures")
7+
id("project-tests-convention")
78
}
89

910
dependencies {
@@ -34,10 +35,11 @@ sourceSets {
3435
"testFixtures" { projectDefault() }
3536
}
3637

37-
projectTest(jUnitMode = JUnitMode.JUnit5) {
38-
dependsOn(":plugins:plugin-sandbox:plugin-annotations:jar")
39-
workingDir = rootDir
40-
useJUnitPlatform()
38+
projectTests {
39+
testTask(jUnitMode = JUnitMode.JUnit5) {
40+
dependsOn(":plugins:plugin-sandbox:plugin-annotations:jar")
41+
workingDir = rootDir
42+
}
4143
}
4244

4345
testsJar()

‎analysis/decompiled/decompiler-js/build.gradle.kts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
plugins {
22
kotlin("jvm")
33
id("jps-compatible")
4+
id("project-tests-convention")
45
}
56

67
sourceSets {
78
"main" { projectDefault() }
89
"test" { projectDefault() }
910
}
1011

11-
projectTest(jUnitMode = JUnitMode.JUnit4) {
12-
workingDir = rootDir
12+
projectTests {
13+
testTask(jUnitMode = JUnitMode.JUnit4) {
14+
workingDir = rootDir
15+
}
1316
}
1417

1518
dependencies {

‎analysis/decompiled/decompiler-native/build.gradle.kts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
kotlin("jvm")
33
id("jps-compatible")
44
id("java-test-fixtures")
5+
id("project-tests-convention")
56
}
67

78
sourceSets {
@@ -10,8 +11,12 @@ sourceSets {
1011
"testFixtures" { projectDefault() }
1112
}
1213

13-
projectTest(jUnitMode = JUnitMode.JUnit4) {
14-
workingDir = rootDir
14+
projectTests {
15+
testTask(jUnitMode = JUnitMode.JUnit4) {
16+
workingDir = rootDir
17+
}
18+
19+
withJvmStdlibAndReflect()
1520
}
1621

1722
dependencies {

‎analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
kotlin("jvm")
33
id("jps-compatible")
44
id("java-test-fixtures")
5+
id("project-tests-convention")
56
}
67

78
dependencies {
@@ -19,7 +20,7 @@ dependencies {
1920
testFixturesApi(testFixtures(project(":compiler:tests-common-new")))
2021
testFixturesApi(testFixtures(project(":analysis:analysis-test-framework")))
2122
testFixturesApi(libs.junit.jupiter.api)
22-
testRuntimeOnly(libs.junit.jupiter.engine)
23+
testRuntimeOnly(libs.junit.vintage.engine)
2324
}
2425

2526
sourceSets {
@@ -28,9 +29,13 @@ sourceSets {
2829
"testFixtures" { projectDefault() }
2930
}
3031

31-
projectTest(jUnitMode = JUnitMode.JUnit5) {
32-
dependsOn(":dist")
33-
workingDir = rootDir
32+
projectTests {
33+
testTask(jUnitMode = JUnitMode.JUnit5) {
34+
dependsOn(":dist")
35+
workingDir = rootDir
36+
}
37+
38+
withJvmStdlibAndReflect()
3439
}
3540

3641

‎analysis/decompiled/decompiler-to-psi/build.gradle.kts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
kotlin("jvm")
33
id("jps-compatible")
44
id("java-test-fixtures")
5+
id("project-tests-convention")
56
}
67

78
dependencies {
@@ -20,7 +21,7 @@ dependencies {
2021
testFixturesApi(testFixtures(project(":compiler:tests-common-new")))
2122
testFixturesApi(testFixtures(project(":analysis:decompiled:decompiler-to-file-stubs")))
2223
testFixturesApi(libs.junit.jupiter.api)
23-
testRuntimeOnly(libs.junit.jupiter.engine)
24+
testRuntimeOnly(libs.junit.vintage.engine)
2425
}
2526

2627
sourceSets {
@@ -32,9 +33,13 @@ sourceSets {
3233
"testFixtures" { projectDefault() }
3334
}
3435

35-
projectTest(jUnitMode = JUnitMode.JUnit5) {
36-
dependsOn(":dist")
37-
workingDir = rootDir
36+
projectTests {
37+
testTask(jUnitMode = JUnitMode.JUnit5) {
38+
dependsOn(":dist")
39+
workingDir = rootDir
40+
}
41+
42+
withJvmStdlibAndReflect()
3843
}
3944

4045
testsJar()

0 commit comments

Comments
 (0)