File tree Expand file tree Collapse file tree 3 files changed +7
-21
lines changed Expand file tree Collapse file tree 3 files changed +7
-21
lines changed Original file line number Diff line number Diff line change @@ -38,10 +38,8 @@ spotless {
3838
3939apply from : rootProject. file(' gradle/special-tests.gradle' )
4040tasks. withType(Test ). configureEach {
41- if (JavaVersion . current(). isCompatibleWith(JavaVersion . VERSION_16 )) {
42- // needed for EclipseCdtFormatterStepTest
43- jvmArgs ' --add-opens=java.base/java.lang=ALL-UNNAMED'
44- }
41+ // needed for EclipseCdtFormatterStepTest
42+ jvmArgs ' --add-opens=java.base/java.lang=ALL-UNNAMED'
4543}
4644
4745def NEEDS_P2_DEPS = [
@@ -50,9 +48,6 @@ def NEEDS_P2_DEPS = [
5048 ' groovy' ,
5149 ' jdt'
5250]
53- if (! JavaVersion . current(). isCompatibleWith(JavaVersion . VERSION_17 )) {
54- NEEDS_P2_DEPS . remove(' cdt' )
55- }
5651for (needsP2 in NEEDS_P2_DEPS ) {
5752 sourceSets. register(needsP2) {
5853 compileClasspath + = sourceSets. main. output
Original file line number Diff line number Diff line change @@ -131,15 +131,9 @@ spotbugs {
131131
132132apply from : rootProject. file(' gradle/special-tests.gradle' )
133133tasks. withType(Test ). configureEach {
134- if (JavaVersion . current(). isCompatibleWith(JavaVersion . VERSION_16 )) {
135- // https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
136- jvmArgs " --add-opens=java.base/java.lang=ALL-UNNAMED"
137- }
134+ jvmArgs " --add-opens=java.base/java.lang=ALL-UNNAMED"
138135
139- if (GradleVersion . current() >= GradleVersion . version(' 9.0' )) {
140- // https://github.com/gradle/gradle/issues/33619
141- failOnNoDiscoveredTests = false
142- }
136+ failOnNoDiscoveredTests = false
143137}
144138
145139jar {
Original file line number Diff line number Diff line change @@ -31,14 +31,11 @@ spotbugs {
3131
3232apply from : rootProject. file(' gradle/special-tests.gradle' )
3333tasks. withType(Test ). configureEach {
34- if (JavaVersion . current(). isCompatibleWith(JavaVersion . VERSION_16 )) {
35- // for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
36- def args = [
34+ // for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
35+ jvmArgs(
3736 ' --add-opens=java.base/java.lang=ALL-UNNAMED' ,
3837 ' --add-opens=java.base/java.util=ALL-UNNAMED' ,
39- ]
40- jvmArgs args
41- }
38+ )
4239}
4340
4441javadoc {
You can’t perform that action at this time.
0 commit comments