Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions lib-extra/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ spotless {

apply from: rootProject.file('gradle/special-tests.gradle')
tasks.withType(Test).configureEach {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
// needed for EclipseCdtFormatterStepTest
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
}
// needed for EclipseCdtFormatterStepTest
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
}

def NEEDS_P2_DEPS = [
Expand All @@ -50,9 +48,6 @@ def NEEDS_P2_DEPS = [
'groovy',
'jdt'
]
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
NEEDS_P2_DEPS.remove('cdt')
}
for (needsP2 in NEEDS_P2_DEPS) {
sourceSets.register(needsP2) {
compileClasspath += sourceSets.main.output
Expand Down
10 changes: 2 additions & 8 deletions lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,9 @@ spotbugs {

apply from: rootProject.file('gradle/special-tests.gradle')
tasks.withType(Test).configureEach {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
}
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"

if (GradleVersion.current() >= GradleVersion.version('9.0')) {
// https://github.com/gradle/gradle/issues/33619
failOnNoDiscoveredTests = false
}
failOnNoDiscoveredTests = false
}

jar {
Expand Down
9 changes: 3 additions & 6 deletions testlib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@ spotbugs {

apply from: rootProject.file('gradle/special-tests.gradle')
tasks.withType(Test).configureEach {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
def args = [
// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
jvmArgs(
'--add-opens=java.base/java.lang=ALL-UNNAMED',
'--add-opens=java.base/java.util=ALL-UNNAMED',
]
jvmArgs args
}
)
}

javadoc {
Expand Down
Loading