upgrade to gradle 8.1-rc1

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

Hide file tree

Showing 9 changed files with 13 additions and 16 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/caffeine/build.gradle b/caffeine/build.gradle
@@ -159,7 +159,7 @@ tasks.register('memoryOverhead', JavaExec) {
   classpath sourceSets.jmh.runtimeClasspath
   classpath sourceSets.codeGen.runtimeClasspath
   mainClass = 'com.github.benmanes.caffeine.cache.MemoryBenchmark'
-  jvmArgs += [
+  jvmArgs [
     '--add-opens', 'java.base/java.util.concurrent.atomic=ALL-UNNAMED',
     '--add-opens', 'java.base/java.util.concurrent.locks=ALL-UNNAMED',
     '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED',

diff --git a/caffeine/testing.gradle b/caffeine/testing.gradle
@@ -86,7 +86,7 @@ tasks.withType(Test).configureEach {
       maxHeapSize = '3g'
     } else if (name.startsWith('lincheck')) {
       options.includeGroups = ['lincheck']
-      jvmArgs += [
+      jvmArgs [
         '--add-opens', 'java.base/jdk.internal.vm=ALL-UNNAMED',
         '--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED',
         '--add-opens', 'java.base/jdk.internal.access=ALL-UNNAMED',

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2g -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.java.installations.fromEnv=JDK_CI
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=true

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 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

diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/JCacheEntryEvent.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/JCacheEntryEvent.java
@@ -31,6 +31,7 @@
  *
  * @author ben.manes@gmail.com (Ben Manes)
  */
+@SuppressWarnings("serial")
 final class JCacheEntryEvent<K, V> extends CacheEntryEvent<K, V>
     implements Iterable<CacheEntryEvent<? extends K, ? extends V>> {
   private static final long serialVersionUID = 1L;

diff --git a/settings.gradle b/settings.gradle
@@ -45,7 +45,6 @@ dependencyResolutionManagement.repositories {
   mavenCentral()
 }
 
-enableFeaturePreview 'STABLE_CONFIGURATION_CACHE'
 rootProject.name = 'caffeine'
 
 include 'caffeine'

diff --git a/simulator/build.gradle b/simulator/build.gradle
@@ -90,7 +90,7 @@ tasks.named('run').configure {
 
 class Simulate extends DefaultTask {
   @Input @Optional @Option(option = 'jvmArgs', description = 'The jvm arguments')
-  String jvmArguments
+  String jvmOptions
   @Input @Option(option = 'maximumSize', description = 'The maximum cache sizes')
   List<String> maximumSizes = []
   @Input @Option(option = 'metric', description = 'The metric to compare')
@@ -106,8 +106,7 @@ class Simulate extends DefaultTask {
     if (maximumSizes.isEmpty()) {
       def yellow = { "\033[33m${it}\033[0m" }
       def italic = { "\033[3m${it}\033[0m" }
-      project.logger.error(
-        "\t${yellow('--maximumSize=')}${italic('<Long>[,<Long>...]')} is required")
+      logger.error("\t${yellow('--maximumSize=')}${italic('<Long>[,<Long>...]')} is required")
       return
     }
     def reports = [:]
@@ -125,8 +124,8 @@ class Simulate extends DefaultTask {
         classpath = project.sourceSets.main.runtimeClasspath
         mainClass = project.application.mainClass
         jvmArgs project.tasks.run.allJvmArgs
-        if (jvmArguments) {
-          jvmArgs jvmArguments.split(',')
+        if (jvmOptions) {
+          jvmArgs (jvmOptions.split(',') as List)
         }
         systemProperties [
           'caffeine.simulator.report.format': 'csv',