Skip to content

Commit dece8ab

Browse files
committed
Upgrade to plugin-plugin 20.4.0
1 parent 98ef54d commit dece8ab

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.github/workflows/nebula.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,18 @@ jobs:
2626
name: Gradle Build without Publish
2727
steps:
2828
- uses: actions/checkout@v1
29-
- name: Set up JDK 16
30-
uses: actions/setup-java@v1
29+
- name: Set up JDK 8
30+
uses: actions/setup-java@v2
3131
with:
32-
java-version: 16
32+
distribution: 'zulu'
33+
java-version: '8'
34+
java-package: jdk
3335
- name: Setup jdk
34-
uses: actions/setup-java@v1
36+
uses: actions/setup-java@v2
3537
with:
38+
distribution: 'zulu'
3639
java-version: ${{ matrix.java }}
40+
java-package: jdk
3741
- uses: actions/cache@v1
3842
id: gradle-cache
3943
with:
@@ -50,6 +54,8 @@ jobs:
5054
- ${{ runner.os }}-gradlewrapper-
5155
- name: Gradle build
5256
run: ./gradlew --info --stacktrace build
57+
env:
58+
JDK_VERSION_FOR_TESTS: ${{ matrix.java }}
5359
publish:
5460
if: startsWith(github.ref, 'refs/tags/v')
5561
needs: validation

build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
plugins {
19-
id 'com.netflix.nebula.plugin-plugin' version '20.3.0'
19+
id 'com.netflix.nebula.plugin-plugin' version '20.4.0'
2020
}
2121

2222
compileGroovy.groovyOptions.configurationScript = file('src/groovyCompile/groovycConfig.groovy')
@@ -122,9 +122,3 @@ gradlePlugin {
122122
}
123123
}
124124
}
125-
126-
tasks.withType(Test) {
127-
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
128-
jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED")
129-
}
130-
}

src/test/groovy/nebula/plugin/info/ci/ContinuousIntegrationInfoPluginSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.util.jar.Attributes
1212
import java.util.jar.JarFile
1313
import java.util.jar.Manifest
1414

15-
@IgnoreIf({ System.getenv('TITUS_TASK_ID') })
15+
@IgnoreIf({ System.getenv('TITUS_TASK_ID') || jvm.isJava17() })
1616
class ContinuousIntegrationInfoPluginSpec extends IntegrationSpec {
1717

1818
@Rule

src/test/groovy/nebula/plugin/info/scm/PerforceScmProviderSpec.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ import org.gradle.api.provider.ProviderFactory
2020
import org.junit.Rule
2121
import org.junit.contrib.java.lang.system.EnvironmentVariables
2222
import org.junit.rules.TemporaryFolder
23+
import spock.lang.IgnoreIf
2324
import spock.lang.Specification
2425

26+
@IgnoreIf({ jvm.isJava17() })
2527
class PerforceScmProviderSpec extends Specification {
2628
@Rule
2729
TemporaryFolder temp

0 commit comments

Comments
 (0)