add jdk 17 support

nebula-plugins · Oct 13, 2021 · 0a4fc0b · 0a4fc0b
1 parent 916c0f6
commit 0a4fc0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         # test against latest update of some major Java version(s), as well as specific LTS version(s)
-        java: [ 8, 11 ]
+        java: [ 8, 11, 17]
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v1

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.3-rc-1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/nebula/test/AbstractProjectSpec.groovy b/src/main/groovy/nebula/test/AbstractProjectSpec.groovy
@@ -4,6 +4,7 @@ import groovy.transform.CompileStatic
 import nebula.test.multiproject.MultiProjectHelper
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
+import org.gradle.testfixtures.internal.ProjectBuilderImpl
 import org.junit.Rule
 import org.junit.rules.TestName
 import spock.lang.Specification
@@ -34,7 +35,11 @@ public abstract class AbstractProjectSpec extends Specification {
         }
         ourProjectDir.mkdirs()
         canonicalName = testName.getMethodName().replaceAll(' ', '-')
-        project = ProjectBuilder.builder().withName(canonicalName).withProjectDir(ourProjectDir).build()
+        ProjectBuilder builder =  ProjectBuilder.builder().withName(canonicalName).withProjectDir(ourProjectDir)
+        try {
+            ProjectBuilderImpl.getGlobalServices()
+        } catch (Throwable ignore) { }
+        project = builder.build()
         helper = new MultiProjectHelper(project)
     }