Upgrade to plugin-plugin 20.4.0

nebula-plugins · Jan 18, 2023 · dece8ab · dece8ab
1 parent 98ef54d
commit dece8ab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml
@@ -26,14 +26,18 @@ jobs:
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 16
-        uses: actions/setup-java@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'zulu'
+          java-version: '8'
+          java-package: jdk
       - name: Setup jdk
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
+          java-package: jdk
       - uses: actions/cache@v1
         id: gradle-cache
         with:
@@ -50,6 +54,8 @@ jobs:
             - ${{ runner.os }}-gradlewrapper-
       - name: Gradle build
         run: ./gradlew --info --stacktrace build
+        env:
+          JDK_VERSION_FOR_TESTS: ${{ matrix.java }}
   publish:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: validation

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
 
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '20.3.0'
+    id 'com.netflix.nebula.plugin-plugin' version '20.4.0'
 }
 
 compileGroovy.groovyOptions.configurationScript = file('src/groovyCompile/groovycConfig.groovy')
@@ -122,9 +122,3 @@ gradlePlugin {
         }
     }
 }
-
-tasks.withType(Test) {
-    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-        jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED")
-    }
-}
diff --git a/src/test/groovy/nebula/plugin/info/ci/ContinuousIntegrationInfoPluginSpec.groovy b/src/test/groovy/nebula/plugin/info/ci/ContinuousIntegrationInfoPluginSpec.groovy
@@ -12,7 +12,7 @@ import java.util.jar.Attributes
 import java.util.jar.JarFile
 import java.util.jar.Manifest
 
-@IgnoreIf({ System.getenv('TITUS_TASK_ID') })
+@IgnoreIf({ System.getenv('TITUS_TASK_ID') || jvm.isJava17() })
 class ContinuousIntegrationInfoPluginSpec extends IntegrationSpec {
 
     @Rule

diff --git a/src/test/groovy/nebula/plugin/info/scm/PerforceScmProviderSpec.groovy b/src/test/groovy/nebula/plugin/info/scm/PerforceScmProviderSpec.groovy
@@ -20,8 +20,10 @@ import org.gradle.api.provider.ProviderFactory
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.EnvironmentVariables
 import org.junit.rules.TemporaryFolder
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
+@IgnoreIf({ jvm.isJava17() })
 class PerforceScmProviderSpec extends Specification {
     @Rule
     TemporaryFolder temp