Skip to content

Commit 4361ba6

Browse files
Don't depend on java-tck JAR (#7489)
1 parent 2d4a5a0 commit 4361ba6

5 files changed

Lines changed: 45 additions & 5 deletions

File tree

rewrite-java-11/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@ plugins {
55

66
val javaTck = configurations.create("javaTck") {
77
isTransitive = false
8+
isCanBeConsumed = false
9+
isCanBeResolved = true
810
}
911

12+
val javaTckClasses = javaTck.incoming.artifactView {
13+
attributes {
14+
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
15+
}
16+
}.files
17+
1018
dependencies {
1119
api(project(":rewrite-core"))
1220
api(project(":rewrite-java"))
@@ -84,7 +92,7 @@ testing {
8492
all {
8593
testTask.configure {
8694
useJUnitPlatform()
87-
testClassesDirs += files(javaTck.files.map { zipTree(it) })
95+
testClassesDirs += javaTckClasses
8896
jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames")
8997
shouldRunAfter(test)
9098
}

rewrite-java-17/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ plugins {
77

88
val javaTck = configurations.create("javaTck") {
99
isTransitive = false
10+
isCanBeConsumed = false
11+
isCanBeResolved = true
1012
}
1113

14+
val javaTckClasses = javaTck.incoming.artifactView {
15+
attributes {
16+
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
17+
}
18+
}.files
19+
1220
dependencies {
1321
api(project(":rewrite-core"))
1422
api(project(":rewrite-java"))
@@ -75,7 +83,7 @@ testing {
7583
all {
7684
testTask.configure {
7785
useJUnitPlatform()
78-
testClassesDirs += files(javaTck.files.map { zipTree(it) })
86+
testClassesDirs += javaTckClasses
7987
jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames")
8088
shouldRunAfter(test)
8189
}

rewrite-java-21/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ plugins {
77

88
val javaTck = configurations.create("javaTck") {
99
isTransitive = false
10+
isCanBeConsumed = false
11+
isCanBeResolved = true
1012
}
1113

14+
val javaTckClasses = javaTck.incoming.artifactView {
15+
attributes {
16+
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
17+
}
18+
}.files
19+
1220
dependencies {
1321
api(project(":rewrite-core"))
1422
api(project(":rewrite-java"))
@@ -76,7 +84,7 @@ testing {
7684
all {
7785
testTask.configure {
7886
useJUnitPlatform()
79-
testClassesDirs += files(javaTck.files.map { zipTree(it) })
87+
testClassesDirs += javaTckClasses
8088
jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames")
8189
shouldRunAfter(test)
8290
}

rewrite-java-25/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ plugins {
77

88
val javaTck = configurations.create("javaTck") {
99
isTransitive = false
10+
isCanBeConsumed = false
11+
isCanBeResolved = true
1012
}
1113

14+
val javaTckClasses = javaTck.incoming.artifactView {
15+
attributes {
16+
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
17+
}
18+
}.files
19+
1220
dependencies {
1321
api(project(":rewrite-core"))
1422
api(project(":rewrite-java"))
@@ -79,7 +87,7 @@ testing {
7987
all {
8088
testTask.configure {
8189
useJUnitPlatform()
82-
testClassesDirs += files(javaTck.files.map { zipTree(it) })
90+
testClassesDirs += javaTckClasses
8391
jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames")
8492
shouldRunAfter(test)
8593
}

rewrite-java-8/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,16 @@ val tools = compiler.get().metadata.installationPath.file("lib/tools.jar")
1111

1212
val javaTck = configurations.create("javaTck") {
1313
isTransitive = false
14+
isCanBeConsumed = false
15+
isCanBeResolved = true
1416
}
1517

18+
val javaTckClasses = javaTck.incoming.artifactView {
19+
attributes {
20+
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
21+
}
22+
}.files
23+
1624
dependencies {
1725
compileOnly(files(tools))
1826
compileOnly("org.slf4j:slf4j-api:1.7.+")
@@ -81,7 +89,7 @@ testing {
8189
all {
8290
testTask.configure {
8391
useJUnitPlatform()
84-
testClassesDirs += files(javaTck.files.map { zipTree(it) })
92+
testClassesDirs += javaTckClasses
8593
jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames")
8694
shouldRunAfter(test)
8795
}

0 commit comments

Comments
 (0)