minor build polish

ben-manes · Mar 1, 2024 · 3cc066c · 3cc066c
1 parent 210be6b
commit 3cc066c
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 36 deletions.
diff --git a/.github/workflows/dependency-submission-pr-retreive.yml b/.github/workflows/dependency-submission-pr-retreive.yml
@@ -37,4 +37,4 @@ jobs:
       - name: Retrieve and submit dependency graph
         uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
-          dependency-graph-action: retrieve-and-submit
+          dependency-graph: download-and-submit
diff --git a/.github/workflows/dependency-submission-pr-submit.yml b/.github/workflows/dependency-submission-pr-submit.yml
@@ -47,4 +47,4 @@ jobs:
         uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-          dependency-graph-action: generate-and-save
+          dependency-graph: generate-and-upload
diff --git a/caffeine/build.gradle.kts b/caffeine/build.gradle.kts
@@ -256,15 +256,15 @@ for (scenario in Scenario.all()) {
         "implementation" to implementation)
 
       useTestNG {
-        if (slow == Slow.Disabled) {
-          threadCount = max(6, Runtime.getRuntime().availableProcessors() - 1)
-          jvmArgs("-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled")
-          excludeGroups("slow", "isolated", "lincheck")
-          parallel = "methods"
-        } else {
-          jvmArgs("-XX:+UseParallelGC")
-          includeGroups.add("slow")
+        if (slow == Slow.Enabled) {
           maxParallelForks = 2
+          includeGroups.add("slow")
+          jvmArgs("-XX:+UseParallelGC")
+        } else {
+          parallel = "methods"
+          excludeGroups("slow", "isolated", "lincheck")
+          jvmArgs("-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled")
+          threadCount = max(6, Runtime.getRuntime().availableProcessors() - 1)
         }
       }
     }

diff --git a/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml b/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 caffeine = "3.1.8"
 junit = "5.10.2"
 reactor = "3.6.2"
-truth = "1.4.1"
+truth = "1.4.2"
 versions = "0.51.0"
 
 [libraries]

diff --git a/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties b/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/coalescing-bulkloader-reactor/settings.gradle.kts b/examples/coalescing-bulkloader-reactor/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/examples/graal-native/gradle/libs.versions.toml b/examples/graal-native/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 caffeine = "3.1.8"
 graal = "0.10.1"
 junit = "5.10.2"
-truth = "1.4.1"
+truth = "1.4.2"
 versions = "0.51.0"
 
 [libraries]

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

diff --git a/examples/graal-native/settings.gradle.kts b/examples/graal-native/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ hibernate = "6.4.4.Final"
 junit = "5.10.2"
 log4j2 = "3.0.0-beta2"
 slf4j = "2.0.7"
-truth = "1.4.1"
+truth = "1.4.2"
 versions = "0.51.0"
 
 [libraries]

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

diff --git a/examples/hibernate/settings.gradle.kts b/examples/hibernate/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/examples/resilience-failsafe/gradle/libs.versions.toml b/examples/resilience-failsafe/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 caffeine = "3.1.8"
 failsafe = "3.3.2"
 junit = "5.10.2"
-truth = "1.4.1"
+truth = "1.4.2"
 versions = "0.51.0"
 
 [libraries]

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

diff --git a/examples/resilience-failsafe/settings.gradle.kts b/examples/resilience-failsafe/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties b/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/write-behind-rxjava/settings.gradle.kts b/examples/write-behind-rxjava/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -85,11 +85,11 @@ snakeyaml = "2.2"
 sonarqube = "4.4.1.3373"
 spotbugs-contrib = "7.6.4"
 spotbugs-core = "4.8.3"
-spotbugs-plugin = "6.0.7"
+spotbugs-plugin = "6.0.8"
 stream = "2.9.8"
 tcache = "2.0.1"
 testng = "7.9.0"
-truth = "1.4.1"
+truth = "1.4.2"
 univocity-parsers = "2.9.1"
 versions = "0.51.0"
 xz = "1.9"

diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/gradle/plugins/src/main/kotlin/ProjectExtensions.kt b/gradle/plugins/src/main/kotlin/ProjectExtensions.kt
@@ -2,7 +2,8 @@ import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.the
 
-val Project.libs get() = the<LibrariesForLibs>()
+val Project.libs
+  get() = the<LibrariesForLibs>()
 
 fun Project.version(major: Int, minor: Int, patch: Int, releaseBuild: Boolean) {
   version = "$major.$minor.$patch" + if (releaseBuild) "" else "-SNAPSHOT"
@@ -32,6 +33,6 @@ val DisableStrongEncapsulationJvmArgs = listOf(
   "--add-exports", "jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
   "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
   "--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-  "--add-opens",   "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-  "--add-opens",   "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-  "--add-opens",   "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED")
+  "--add-opens", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+  "--add-opens", "jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+  "--add-opens", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED")
diff --git a/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/analyze/jmh-caffeine-conventions.gradle.kts
@@ -80,7 +80,7 @@ tasks.withType<JmhTask>().configureEach {
 }
 
 tasks.withType<JmhBytecodeGeneratorTask>().configureEach {
-  javaLauncher= javaToolchains.launcherFor {
+  javaLauncher = javaToolchains.launcherFor {
     languageVersion = java.toolchain.languageVersion
   }
 }

diff --git a/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
@@ -9,7 +9,7 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
     componentSelection {
       all {
         val stable = setOf("com.hazelcast", "javax.json.bind",
-            "org.jetbrains.kotlin", "org.osgi", "org.slf4j")
+          "org.jetbrains.kotlin", "org.osgi", "org.slf4j")
         if ((candidate.group in stable) && isNonStable(candidate.version)) {
           reject("Release candidate")
         } else if ((candidate.module == "commons-io") && candidate.version.startsWith("2003")) {

diff --git a/gradle/plugins/src/main/kotlin/lifecycle/publish-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/publish-caffeine-conventions.gradle.kts
@@ -29,7 +29,7 @@ publishing {
         name = "Caffeine cache"
         description = project.description
         url = "https://github.com/ben-manes/caffeine"
-        inceptionYear= "2014"
+        inceptionYear = "2014"
 
         scm {
           url = "https://github.com/ben-manes/caffeine"

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.7-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@ pluginManagement {
 }
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }