From 9a6537775792416dee130253a70f07643ceb282a Mon Sep 17 00:00:00 2001 From: Greg Oledzki Date: Tue, 28 Apr 2026 12:30:06 +0200 Subject: [PATCH] Don't depend on java-tck JAR --- rewrite-java-11/build.gradle.kts | 10 +++++++++- rewrite-java-17/build.gradle.kts | 10 +++++++++- rewrite-java-21/build.gradle.kts | 10 +++++++++- rewrite-java-25/build.gradle.kts | 10 +++++++++- rewrite-java-8/build.gradle.kts | 10 +++++++++- 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/rewrite-java-11/build.gradle.kts b/rewrite-java-11/build.gradle.kts index 0851a749471..253029aa408 100644 --- a/rewrite-java-11/build.gradle.kts +++ b/rewrite-java-11/build.gradle.kts @@ -5,8 +5,16 @@ plugins { val javaTck = configurations.create("javaTck") { isTransitive = false + isCanBeConsumed = false + isCanBeResolved = true } +val javaTckClasses = javaTck.incoming.artifactView { + attributes { + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES)) + } +}.files + dependencies { api(project(":rewrite-core")) api(project(":rewrite-java")) @@ -84,7 +92,7 @@ testing { all { testTask.configure { useJUnitPlatform() - testClassesDirs += files(javaTck.files.map { zipTree(it) }) + testClassesDirs += javaTckClasses jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames") shouldRunAfter(test) } diff --git a/rewrite-java-17/build.gradle.kts b/rewrite-java-17/build.gradle.kts index fb825638f44..21bf2d1bb75 100644 --- a/rewrite-java-17/build.gradle.kts +++ b/rewrite-java-17/build.gradle.kts @@ -7,8 +7,16 @@ plugins { val javaTck = configurations.create("javaTck") { isTransitive = false + isCanBeConsumed = false + isCanBeResolved = true } +val javaTckClasses = javaTck.incoming.artifactView { + attributes { + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES)) + } +}.files + dependencies { api(project(":rewrite-core")) api(project(":rewrite-java")) @@ -75,7 +83,7 @@ testing { all { testTask.configure { useJUnitPlatform() - testClassesDirs += files(javaTck.files.map { zipTree(it) }) + testClassesDirs += javaTckClasses jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames") shouldRunAfter(test) } diff --git a/rewrite-java-21/build.gradle.kts b/rewrite-java-21/build.gradle.kts index 17df0c63c6e..95ce16fd8e7 100644 --- a/rewrite-java-21/build.gradle.kts +++ b/rewrite-java-21/build.gradle.kts @@ -7,8 +7,16 @@ plugins { val javaTck = configurations.create("javaTck") { isTransitive = false + isCanBeConsumed = false + isCanBeResolved = true } +val javaTckClasses = javaTck.incoming.artifactView { + attributes { + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES)) + } +}.files + dependencies { api(project(":rewrite-core")) api(project(":rewrite-java")) @@ -76,7 +84,7 @@ testing { all { testTask.configure { useJUnitPlatform() - testClassesDirs += files(javaTck.files.map { zipTree(it) }) + testClassesDirs += javaTckClasses jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames") shouldRunAfter(test) } diff --git a/rewrite-java-25/build.gradle.kts b/rewrite-java-25/build.gradle.kts index 5f304745891..7b81fc786b1 100644 --- a/rewrite-java-25/build.gradle.kts +++ b/rewrite-java-25/build.gradle.kts @@ -7,8 +7,16 @@ plugins { val javaTck = configurations.create("javaTck") { isTransitive = false + isCanBeConsumed = false + isCanBeResolved = true } +val javaTckClasses = javaTck.incoming.artifactView { + attributes { + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES)) + } +}.files + dependencies { api(project(":rewrite-core")) api(project(":rewrite-java")) @@ -79,7 +87,7 @@ testing { all { testTask.configure { useJUnitPlatform() - testClassesDirs += files(javaTck.files.map { zipTree(it) }) + testClassesDirs += javaTckClasses jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames") shouldRunAfter(test) } diff --git a/rewrite-java-8/build.gradle.kts b/rewrite-java-8/build.gradle.kts index cff4ccb49fa..b008dd6eea8 100644 --- a/rewrite-java-8/build.gradle.kts +++ b/rewrite-java-8/build.gradle.kts @@ -11,8 +11,16 @@ val tools = compiler.get().metadata.installationPath.file("lib/tools.jar") val javaTck = configurations.create("javaTck") { isTransitive = false + isCanBeConsumed = false + isCanBeResolved = true } +val javaTckClasses = javaTck.incoming.artifactView { + attributes { + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES)) + } +}.files + dependencies { compileOnly(files(tools)) compileOnly("org.slf4j:slf4j-api:1.7.+") @@ -81,7 +89,7 @@ testing { all { testTask.configure { useJUnitPlatform() - testClassesDirs += files(javaTck.files.map { zipTree(it) }) + testClassesDirs += javaTckClasses jvmArgs = listOf("-XX:+UnlockDiagnosticVMOptions", "-XX:+ShowHiddenFrames") shouldRunAfter(test) }