Upgrade dependencies

Author: jbduncan

build.gradle.kts

@@ -1,18 +1,13 @@
-import com.diffplug.gradle.spotless.SpotlessApply
-import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import net.ltgt.gradle.errorprone.errorprone
-import org.gradle.api.tasks.compile.JavaCompile
-import org.openrewrite.gradle.ResolveRewriteDependenciesTask
-import org.openrewrite.gradle.RewriteDryRunTask
-import org.openrewrite.gradle.RewriteRunTask
 
 plugins {
     `java-library`
 
     id("com.diffplug.spotless") version "6.25.0"
     id("com.github.ben-manes.versions") version "0.51.0"
-    id("net.ltgt.errorprone") version "3.1.0"
-    id("org.openrewrite.rewrite") version "6.8.4"
+    id("net.ltgt.errorprone") version "4.1.0"
+    id("org.gradlex.reproducible-builds") version "1.0"
+    id("org.openrewrite.rewrite") version "6.28.1"
 }
 
 group = "com.github.jbduncan.guavagraphutils"
@@ -30,23 +25,24 @@ repositories {
 }
 
 dependencies {
-    api("com.google.guava:guava:33.0.0-jre")
+    api("com.google.guava:guava:33.3.1-jre")
 
-    testImplementation("net.jqwik:jqwik:1.8.3")
-    testImplementation("org.assertj:assertj-core:3.25.3")
+    testImplementation("net.jqwik:jqwik:1.9.1")
+    testImplementation("org.assertj:assertj-core:3.26.3")
     testImplementation("org.jgrapht:jgrapht-guava:1.5.2")
     testImplementation("org.jgrapht:jgrapht-core:1.5.2")
-    testImplementation(platform("org.junit:junit-bom:5.10.2"))
+    testImplementation(platform("org.junit:junit-bom:5.11.3"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
-    compileOnly("org.jspecify:jspecify:0.3.0")
-    testCompileOnly("org.jspecify:jspecify:0.3.0")
+    compileOnly("org.jspecify:jspecify:1.0.0")
+    testCompileOnly("org.jspecify:jspecify:1.0.0")
 
-    errorprone("com.google.errorprone:error_prone_core:2.25.0")
-    errorprone("com.uber.nullaway:nullaway:0.10.23")
+    errorprone("com.google.errorprone:error_prone_core:2.36.0")
+    errorprone("com.uber.nullaway:nullaway:0.12.1")
 
-    rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.7.1"))
+    rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.23.1"))
+    rewrite("org.openrewrite.recipe:rewrite-java-dependencies")
     rewrite("org.openrewrite.recipe:rewrite-java-security")
     rewrite("org.openrewrite.recipe:rewrite-migrate-java")
     rewrite("org.openrewrite.recipe:rewrite-recommendations")
@@ -59,12 +55,8 @@ tasks.test.configure {
     }
 }
 
-tasks.withType<JavaCompile>().configureEach {
-    options.compilerArgs = listOf("-Xlint:all,-processing")
-    options.encoding = "UTF-8"
-}
-
 tasks.compileJava.configure {
+    options.compilerArgs = listOf("-Xlint:all,-processing")
     options.errorprone {
         error("NullAway")
         option("NullAway:AnnotatedPackages", "${project.group}")
@@ -80,24 +72,17 @@ tasks.compileTestJava.configure {
     options.errorprone.disable("NullAway")
 }
 
-tasks.withType<AbstractArchiveTask>().configureEach {
-    isPreserveFileTimestamps = false
-    isReproducibleFileOrder = true
-    dirMode = Integer.parseInt("0755", 8)
-    fileMode = Integer.parseInt("0644", 8)
-}
-
 spotless {
     java {
-        googleJavaFormat("1.20.0")
+        googleJavaFormat("1.25.0")
             .reflowLongStrings()
             .reorderImports(true)
             .formatJavadoc(true)
         formatAnnotations()
     }
 }
 
-tasks.withType<DependencyUpdatesTask>().configureEach {
+tasks.dependencyUpdates.configure {
     fun isStable(version: String): Boolean {
         val regex = "^[0-9,.v-]+(-r)?$".toRegex()
         val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
@@ -114,38 +99,18 @@ rewrite {
         "com.github.jbduncan.rewrite.CodeCleanup",
         "com.github.jbduncan.rewrite.SecurityBestPractices"
     )
+    isExportDatatables = true
 
     configFile = file("$rootDir/config/rewrite.yml")
     failOnDryRunResults = true
 }
 
-tasks.withType<RewriteRunTask>().configureEach {
-    notCompatibleWithConfigurationCache(
-        "Uses Task, Project and Task.project at configuration time, which are unsupported by " +
-                "the configuration cache"
-    )
-}
-
-tasks.withType<RewriteDryRunTask>().configureEach {
-    notCompatibleWithConfigurationCache(
-        "Uses Task, Project and Task.project at configuration time, which are unsupported by " +
-                "the configuration cache"
-    )
-}
-
-tasks.withType<ResolveRewriteDependenciesTask>().configureEach {
-    notCompatibleWithConfigurationCache(
-        "Uses Configuration, Project and Task.project at configuration time, which are " +
-                "unsupported by the configuration cache"
-    )
-}
-
 tasks.check.configure {
-    dependsOn(tasks.withType<RewriteDryRunTask>())
+    dependsOn(tasks.rewriteDryRun)
 }
 
-tasks.withType<SpotlessApply>().configureEach {
-    mustRunAfter(tasks.withType<RewriteRunTask>())
+tasks.spotlessApply.configure {
+    mustRunAfter(tasks.rewriteRun)
 }
 
 // TODO: Adjust use of Gradle toolchains as per https://jakewharton.com/gradle-toolchains-are-rarely-a-good-idea/

config/rewrite.yml

@@ -4,40 +4,93 @@ name: com.github.jbduncan.rewrite.CodeCleanup
 recipeList:
   - org.openrewrite.java.RemoveObjectsIsNull
   - org.openrewrite.java.ShortenFullyQualifiedTypeReferences
+  - org.openrewrite.java.UseStaticImport:
+      methodPattern: java.util.Collections *(..)
+  - org.openrewrite.java.UseStaticImport:
+      methodPattern: com.google.common.collect.Queues *(..)
+  - org.openrewrite.java.UseStaticImport:
+      methodPattern: com.google.common.collect.Sets *(..)
+  - org.openrewrite.java.dependencies.DependencyVulnerabilityCheck
   - org.openrewrite.java.format.BlankLines
   - org.openrewrite.java.format.MethodParamPad
   - org.openrewrite.java.format.NoWhitespaceAfter
   - org.openrewrite.java.format.NoWhitespaceBefore
   - org.openrewrite.java.format.PadEmptyForLoopComponents
   - org.openrewrite.java.format.RemoveTrailingWhitespace
+  - org.openrewrite.java.jspecify.MigrateToJspecify
   - org.openrewrite.java.migrate.UpgradeToJava21
-  - org.openrewrite.java.migrate.guava.NoGuavaJava21
+  - org.openrewrite.java.migrate.UseJavaUtilBase64
+  - org.openrewrite.java.migrate.concurrent.JavaConcurrentAPIs
+  - org.openrewrite.java.migrate.guava.NoGuavaAtomicsNewReference
+  - org.openrewrite.java.migrate.guava.NoGuavaCreateTempDir
+  - org.openrewrite.java.migrate.guava.NoGuavaDirectExecutor
+  - org.openrewrite.java.migrate.guava.NoGuavaListsNewArrayList
+  - org.openrewrite.java.migrate.guava.NoGuavaListsNewCopyOnWriteArrayList
+  - org.openrewrite.java.migrate.guava.NoGuavaListsNewLinkedList
+  - org.openrewrite.java.migrate.guava.NoGuavaMapsNewTreeMap
+  - org.openrewrite.java.migrate.guava.NoGuavaRefasterRecipes
+  - org.openrewrite.java.migrate.guava.NoGuavaSetsNewConcurrentHashSet
+  - org.openrewrite.java.migrate.guava.NoGuavaSetsNewHashSet
+  - org.openrewrite.java.migrate.guava.NoGuavaSetsNewLinkedHashSet
+  - org.openrewrite.java.migrate.guava.PreferCharCompare
+  - org.openrewrite.java.migrate.guava.PreferIntegerCompare
+  - org.openrewrite.java.migrate.guava.PreferIntegerCompareUnsigned
+  - org.openrewrite.java.migrate.guava.PreferIntegerDivideUnsigned
+  - org.openrewrite.java.migrate.guava.PreferIntegerParseUnsignedInt
+  - org.openrewrite.java.migrate.guava.PreferJavaNioCharsetStandardCharsets
+  - org.openrewrite.java.migrate.guava.PreferJavaStringJoin
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilCollectionsSynchronizedNavigableMap
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilCollectionsUnmodifiableNavigableMap
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilFunction
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilObjectsEquals
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilObjectsHashCode
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilObjectsRequireNonNullElse
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilOptional
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilPredicate
+  - org.openrewrite.java.migrate.guava.PreferJavaUtilSupplier
+  - org.openrewrite.java.migrate.guava.PreferLongCompare
+  - org.openrewrite.java.migrate.guava.PreferLongCompareUnsigned
+  - org.openrewrite.java.migrate.guava.PreferLongDivideUnsigned
+  - org.openrewrite.java.migrate.guava.PreferLongParseUnsignedLong
+  - org.openrewrite.java.migrate.guava.PreferLongRemainderUnsigned
+  - org.openrewrite.java.migrate.guava.PreferMathAddExact
+  - org.openrewrite.java.migrate.guava.PreferMathClamp
+  - org.openrewrite.java.migrate.guava.PreferMathMultiplyExact
+  - org.openrewrite.java.migrate.guava.PreferMathSubtractExact
+  - org.openrewrite.java.migrate.guava.PreferShortCompare
   - org.openrewrite.java.migrate.io.ReplaceFileInOrOutputStreamFinalizeWithClose
-  - org.openrewrite.java.migrate.lang.UseTextBlocks
-  - org.openrewrite.java.migrate.net.URLConstructorsToURIRecipes
-  - org.openrewrite.java.migrate.net.JavaNetAPIs
-  - org.openrewrite.java.migrate.util.SequencedCollection
   - org.openrewrite.java.migrate.lang.JavaLangAPIs
   - org.openrewrite.java.migrate.lang.StringFormatted
   - org.openrewrite.java.migrate.lang.StringRulesRecipes
   - org.openrewrite.java.migrate.lang.UseStringIsEmptyRecipe
-  - org.openrewrite.java.migrate.UseJavaUtilBase64
-  - org.openrewrite.java.migrate.concurrent.JavaConcurrentAPIs
+  - org.openrewrite.java.migrate.lang.UseTextBlocks
   - org.openrewrite.java.migrate.logging.JavaLoggingAPIs
+  - org.openrewrite.java.migrate.net.JavaNetAPIs
+  - org.openrewrite.java.migrate.net.URLConstructorsToURIRecipes
   - org.openrewrite.java.migrate.util.OptionalStreamRecipe
+  - org.openrewrite.java.migrate.util.SequencedCollection
   - org.openrewrite.java.testing.assertj.AdoptAssertJDurationAssertions
   - org.openrewrite.java.testing.assertj.Assertj
-  - org.openrewrite.staticanalysis.NoDoubleBraceInitialization
+  - org.openrewrite.java.testing.cleanup.AssertLiteralBooleanToFailRecipe
   - org.openrewrite.java.testing.cleanup.AssertTrueNullToAssertNull
-  - org.openrewrite.java.testing.cleanup.BestPractices
   - org.openrewrite.java.testing.cleanup.RemoveEmptyTests
-  - org.openrewrite.java.testing.cleanup.TestsShouldIncludeAssertions
+  - org.openrewrite.java.testing.cleanup.RemoveTestPrefix
+  - org.openrewrite.java.testing.cleanup.TestsShouldNotBePublic
+  - org.openrewrite.java.testing.junit5.AddParameterizedTestAnnotation
+  - org.openrewrite.java.testing.junit5.AssertThrowsOnLastStatement
+  - org.openrewrite.java.testing.junit5.CleanupAssertions
   - org.openrewrite.java.testing.junit5.JUnit4to5Migration
-  - org.openrewrite.java.testing.junit5.JUnit5BestPractices
+  - org.openrewrite.java.testing.junit5.LifecycleNonPrivate
+  - org.openrewrite.java.testing.junit5.RemoveDuplicateTestTemplates
+  - org.openrewrite.java.testing.junit5.StaticImports
   - org.openrewrite.java.testing.mockito.ReplacePowerMockito
+  - org.openrewrite.kotlin.cleanup.EqualsMethodUsage
+  - org.openrewrite.kotlin.cleanup.ImplicitParameterInLambda
+  - org.openrewrite.kotlin.cleanup.ReplaceCharToIntWithCode
   - org.openrewrite.recommendations.CodeHealth
   - org.openrewrite.staticanalysis.AddSerialVersionUidToSerializable
   - org.openrewrite.staticanalysis.AtomicPrimitiveEqualsUsesGet
+  - org.openrewrite.staticanalysis.BigDecimalDoubleConstructorRecipe
   - org.openrewrite.staticanalysis.BigDecimalRoundingConstantsToEnums
   - org.openrewrite.staticanalysis.BooleanChecksNotInverted
   - org.openrewrite.staticanalysis.CaseInsensitiveComparisonsDoNotChangeCase
@@ -46,7 +99,6 @@ recipeList:
   - org.openrewrite.staticanalysis.CodeCleanup
   - org.openrewrite.staticanalysis.CombineSemanticallyEqualCatchBlocks
   - org.openrewrite.staticanalysis.CommonDeclarationSiteTypeVariances
-  - org.openrewrite.staticanalysis.CommonStaticAnalysis
   - org.openrewrite.staticanalysis.CompareEnumsWithEqualityOperator
   - org.openrewrite.staticanalysis.CovariantEquals
   - org.openrewrite.staticanalysis.DefaultComesLast
@@ -78,11 +130,13 @@ recipeList:
   - org.openrewrite.staticanalysis.MissingOverrideAnnotation
   - org.openrewrite.staticanalysis.ModifierOrder
   - org.openrewrite.staticanalysis.MultipleVariableDeclarations
-  - org.openrewrite.staticanalysis.NestedEnumsAreNotStatic
+  - org.openrewrite.staticanalysis.NeedBraces
   - org.openrewrite.staticanalysis.NewStringBuilderBufferWithCharArgument
+  - org.openrewrite.staticanalysis.NoDoubleBraceInitialization
   - org.openrewrite.staticanalysis.NoEmptyCollectionWithRawType
   - org.openrewrite.staticanalysis.NoEqualityInForCondition
   - org.openrewrite.staticanalysis.NoFinalizedLocalVariables
+  - org.openrewrite.staticanalysis.NoFinalizer
   - org.openrewrite.staticanalysis.NoPrimitiveWrappersForToStringOrCompareTo
   - org.openrewrite.staticanalysis.NoRedundantJumpStatements
   - org.openrewrite.staticanalysis.NoToStringOnStringType
@@ -103,8 +157,8 @@ recipeList:
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
   - org.openrewrite.staticanalysis.RenameLocalVariablesToCamelCase
-  - org.openrewrite.staticanalysis.RenameMethodsNamedHashcodeEqualOrTostring
   - org.openrewrite.staticanalysis.RenamePrivateFieldsToCamelCase
+  - org.openrewrite.staticanalysis.ReplaceClassIsInstanceWithInstanceof
   - org.openrewrite.staticanalysis.ReplaceDeprecatedRuntimeExecMethods
   - org.openrewrite.staticanalysis.ReplaceDuplicateStringLiterals
   - org.openrewrite.staticanalysis.ReplaceLambdaWithMethodReference
@@ -129,6 +183,7 @@ recipeList:
   - org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments
   - org.openrewrite.staticanalysis.UnnecessaryParentheses
   - org.openrewrite.staticanalysis.UnnecessaryPrimitiveAnnotations
+  - org.openrewrite.staticanalysis.UnnecessaryReturnAsLastStatement
   - org.openrewrite.staticanalysis.UnnecessaryThrows
   - org.openrewrite.staticanalysis.UnwrapRepeatableAnnotations
   - org.openrewrite.staticanalysis.UpperCaseLiteralSuffixes
@@ -142,6 +197,7 @@ recipeList:
   - org.openrewrite.staticanalysis.UseStandardCharset
   - org.openrewrite.staticanalysis.UseStringReplace
   - org.openrewrite.staticanalysis.UseSystemLineSeparator
+  - org.openrewrite.staticanalysis.WhileInsteadOfFor
   - org.openrewrite.staticanalysis.WriteOctalValuesAsDecimal
 ---
 type: specs.openrewrite.org/v1beta/recipe

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail