upgrade to gradle 8.1-rc1

ben-manes · Mar 21, 2023 · 7bc7986 · 7bc7986
1 parent 891095b
commit 7bc7986
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,12 +41,10 @@ allprojects {
   }
 
   dependencies {
-    def ignored = [
-      'api', 'apiElements', 'archives', 'compileClasspath', 'compileOnlyApi', 'default',
-      'implementation', 'javadocElements', 'runtimeClasspath', 'runtimeElements', 'runtimeOnly',
-      'sourcesElements', 'testCompileClasspath', 'testRuntimeClasspath']
+    def ignored = ['api', 'compileOnlyApi', 'implementation',
+      'javadocElements', 'runtimeOnly', 'sourcesElements']
     configurations.configureEach { configuration ->
-      if (name !in ignored) {
+      if ((name !in ignored) && configuration.isCanBeDeclaredAgainst()) {
         restrictions.each { module, version ->
           constraints.add(configuration.name, module).version { require version }
         }

diff --git a/gradle/codeQuality.gradle b/gradle/codeQuality.gradle
@@ -129,7 +129,7 @@ def JVM_ARGS_STRONG_ENCAPSULATION = [
 ]
 
 tasks.withType(JavaExec).configureEach {
-  jvmArgs += JVM_ARGS_STRONG_ENCAPSULATION
+  jvmArgs = (jvmArgs ?: []) + JVM_ARGS_STRONG_ENCAPSULATION
   javaLauncher = javaToolchains.launcherFor {
     languageVersion = java.toolchain.languageVersion
   }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME