Excavator: Update to Gradle 7

baseline-error-prone/build.gradle

@@ -4,24 +4,24 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 
 dependencies {
-    compile 'com.google.errorprone:error_prone_core'
-    compile 'org.mockito:mockito-errorprone'
-    compile 'org.immutables:value::annotations'
+    api 'com.google.errorprone:error_prone_core'
+    api 'org.mockito:mockito-errorprone'
+    api 'org.immutables:value::annotations'
 
-    testCompile gradleApi()
-    testCompile 'com.palantir.tokens:auth-tokens'
-    testCompile 'com.fasterxml.jackson.core:jackson-annotations'
-    testCompile 'com.google.errorprone:error_prone_test_helpers'
-    testCompile 'com.palantir.safe-logging:preconditions'
-    testCompile 'com.palantir.safe-logging:safe-logging'
-    testCompile 'com.palantir.safe-logging:logger'
-    testCompile 'org.slf4j:slf4j-api'
-    testCompile 'org.apache.commons:commons-lang3'
-    testCompile 'commons-lang:commons-lang'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.jooq:jooq'
-    testCompile 'com.palantir.tritium:tritium-registry'
-    testCompile 'com.palantir.conjure.java:conjure-lib'
+    testImplementation gradleApi()
+    testImplementation 'com.palantir.tokens:auth-tokens'
+    testImplementation 'com.fasterxml.jackson.core:jackson-annotations'
+    testImplementation 'com.google.errorprone:error_prone_test_helpers'
+    testImplementation 'com.palantir.safe-logging:preconditions'
+    testImplementation 'com.palantir.safe-logging:safe-logging'
+    testImplementation 'com.palantir.safe-logging:logger'
+    testImplementation 'org.slf4j:slf4j-api'
+    testImplementation 'org.apache.commons:commons-lang3'
+    testImplementation 'commons-lang:commons-lang'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.jooq:jooq'
+    testImplementation 'com.palantir.tritium:tritium-registry'
+    testImplementation 'com.palantir.conjure.java:conjure-lib'
     testCompileOnly 'org.immutables:value::annotations'
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-migrationsupport'

baseline-refaster-javac-plugin/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 
 dependencies {
-    compile 'com.google.errorprone:error_prone_refaster'
-    compile 'org.slf4j:slf4j-api'
+    api 'com.google.errorprone:error_prone_refaster'
+    api 'org.slf4j:slf4j-api'
 
     annotationProcessor 'com.google.auto.service:auto-service'
     compileOnly 'com.google.auto.service:auto-service'

baseline-refaster-rules/build.gradle

@@ -6,9 +6,9 @@ dependencies {
     implementation 'org.mockito:mockito-core'
     implementation 'com.palantir.tritium:tritium-registry'
 
-    testCompile 'junit:junit'
-    testCompile project(':baseline-refaster-testing')
-    testCompile 'org.immutables:value::annotations'
+    testImplementation 'junit:junit'
+    testImplementation project(':baseline-refaster-testing')
+    testImplementation 'org.immutables:value::annotations'
 
     compileOnly 'org.immutables:value::annotations'
 }

baseline-refaster-testing/build.gradle

@@ -18,10 +18,10 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 
 dependencies {
-    compile 'com.google.errorprone:error_prone_refaster'
-    compile 'com.google.errorprone:error_prone_test_helpers'
+    api 'com.google.errorprone:error_prone_refaster'
+    api 'com.google.errorprone:error_prone_test_helpers'
 
-    compile 'com.google.guava:guava'
-    compile 'junit:junit'
-    compile 'org.assertj:assertj-core'
+    api 'com.google.guava:guava'
+    api 'junit:junit'
+    api 'org.assertj:assertj-core'
 }

gradle-baseline-java/build.gradle

@@ -4,15 +4,15 @@ apply plugin: 'com.palantir.external-publish-jar'
 apply plugin: 'com.palantir.external-publish-gradle-plugin'
 
 dependencies {
-    compile project(':gradle-junit-reports')
-    compile gradleApi()
-    compile 'org.apache.commons:commons-lang3'
-    compile 'com.diffplug.spotless:spotless-plugin-gradle'
-    compile 'com.google.errorprone:error_prone_refaster'
-    compile 'com.google.guava:guava'
-    compile 'net.ltgt.gradle:gradle-errorprone-plugin'
-    compile 'org.apache.maven.shared:maven-dependency-analyzer'
-    compile 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11'
+    api project(':gradle-junit-reports')
+    api gradleApi()
+    api 'org.apache.commons:commons-lang3'
+    api 'com.diffplug.spotless:spotless-plugin-gradle'
+    api 'com.google.errorprone:error_prone_refaster'
+    api 'com.google.guava:guava'
+    api 'net.ltgt.gradle:gradle-errorprone-plugin'
+    api 'org.apache.maven.shared:maven-dependency-analyzer'
+    api 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11'
     implementation 'commons-lang:commons-lang'
     implementation 'com.palantir.javaformat:palantir-java-format-spi'
     // Add an explicit dependency to ensure consumers can use JDK14 source compat
@@ -21,12 +21,12 @@ dependencies {
 
     runtimeOnly 'com.palantir.javaformat:gradle-palantir-java-format'
 
-    testCompile gradleTestKit()
-    testCompile 'com.github.stefanbirkner:system-rules'
-    testCompile 'com.netflix.nebula:nebula-test' // for better temp directory junit rule only
-    testCompile 'junit:junit'
-    testCompile 'net.lingala.zip4j:zip4j'
-    testCompile 'org.assertj:assertj-core'
+    testImplementation gradleTestKit()
+    testImplementation 'com.github.stefanbirkner:system-rules'
+    testImplementation 'com.netflix.nebula:nebula-test' // for better temp directory junit rule only
+    testImplementation 'junit:junit'
+    testImplementation 'net.lingala.zip4j:zip4j'
+    testImplementation 'org.assertj:assertj-core'
 
     annotationProcessor 'org.inferred:freebuilder'
     compileOnly 'org.inferred:freebuilder'

gradle-baseline-java/src/test/resources/com/palantir/baseline/build.gradle

@@ -11,8 +11,8 @@ repositories {
 sourceCompatibility = 1.8
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.10.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.10.0'
 }
 
 tasks.withType(Checkstyle) {

gradle-baseline-java/src/test/resources/com/palantir/baseline/subproject.gradle

@@ -26,8 +26,8 @@ repositories {
 sourceCompatibility = 1.7
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:3.10.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.10.0'
 }
 
 tasks.withType(Checkstyle) {

gradle-junit-reports/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'java-library'
 apply plugin: 'com.palantir.external-publish-jar'
 
 dependencies {
-  compile gradleApi()
-  compile 'com.google.guava:guava'
+  api gradleApi()
+  api 'com.google.guava:guava'
 
   annotationProcessor 'org.immutables:value'
   annotationProcessor 'org.inferred:freebuilder'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

versions.lock

@@ -46,8 +46,8 @@ commons-io:commons-io:2.6 (1 constraints: 3414465b)
 commons-lang:commons-lang:2.6 (1 constraints: ac04232c)
 io.dropwizard.metrics:metrics-core:3.2.6 (1 constraints: 95108ba5)
 io.github.java-diff-utils:java-diff-utils:4.0 (1 constraints: 811205f6)
-junit:junit:4.13.2 (10 constraints: ae9100f0)
-net.bytebuddy:byte-buddy:1.11.3 (1 constraints: 400b38de)
+junit:junit:4.13.2 (10 constraints: 6492a317)
+net.bytebuddy:byte-buddy:1.11.3 (2 constraints: d41828da)
 net.bytebuddy:byte-buddy-agent:1.11.3 (1 constraints: 400b38de)
 net.ltgt.gradle:gradle-errorprone-plugin:2.0.2 (1 constraints: 0605f735)
 org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b)
@@ -60,25 +60,25 @@ org.apache.maven:maven-repository-metadata:2.0.5 (1 constraints: 9010bab6)
 org.apache.maven:maven-settings:2.0.5 (1 constraints: 310dcb20)
 org.apache.maven.shared:maven-dependency-analyzer:1.11.3 (1 constraints: 38052f3b)
 org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 (1 constraints: 54120e10)
-org.assertj:assertj-core:3.20.2 (1 constraints: 39053b3b)
+org.assertj:assertj-core:3.20.2 (2 constraints: 69174f47)
 org.checkerframework:checker-qual:3.8.0 (3 constraints: 7e247427)
 org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: c7384aee)
-org.codehaus.groovy:groovy:3.0.8 (1 constraints: 970d8d2a)
+org.codehaus.groovy:groovy:3.0.8 (3 constraints: b428c4bb)
 org.codehaus.groovy:groovy-xml:3.0.8 (1 constraints: 781160da)
 org.codehaus.plexus:plexus-component-annotations:2.1.0 (1 constraints: 8d142b84)
 org.codehaus.plexus:plexus-container-default:1.0-alpha-9 (4 constraints: 6841d5d5)
 org.codehaus.plexus:plexus-utils:1.5.1 (10 constraints: a99af4e0)
 org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r (3 constraints: 943f600e)
 org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1 (1 constraints: 0405f135)
-org.hamcrest:hamcrest:2.2 (1 constraints: 720b95d5)
+org.hamcrest:hamcrest:2.2 (2 constraints: 43187376)
 org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b319e)
 org.hamcrest:hamcrest-library:1.3 (1 constraints: fc138c38)
 org.immutables:value:2.8.8 (1 constraints: 14051536)
 org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b)
 org.mockito:mockito-core:3.11.2 (3 constraints: 0f22a4e7)
 org.mockito:mockito-errorprone:3.11.2 (1 constraints: 39053a3b)
-org.objenesis:objenesis:3.2 (2 constraints: 9a17f457)
-org.ow2.asm:asm:9.2 (3 constraints: 43230231)
+org.objenesis:objenesis:3.2 (3 constraints: 6b2483ae)
+org.ow2.asm:asm:9.2 (4 constraints: 1930842b)
 org.pcollections:pcollections:2.1.2 (1 constraints: f21022b8)
 org.scala-lang:scala-library:2.11.11 (4 constraints: a13f1e3f)
 org.scala-lang.modules:scala-parser-combinators_2.11:1.0.6 (1 constraints: 960d3e43)
@@ -88,13 +88,13 @@ org.scalastyle:scalastyle_2.11:1.0.0 (1 constraints: 8117cd64)
 org.slf4j:slf4j-api:1.7.32 (6 constraints: 1a527c1a)
 
 [Test dependencies]
-cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24)
+cglib:cglib-nodep:3.3.0 (2 constraints: 7a1acf3c)
 com.fasterxml.jackson:jackson-bom:2.12.3 (3 constraints: 7f37b4d3)
 com.fasterxml.jackson.core:jackson-annotations:2.12.3 (5 constraints: 0b4459fb)
 com.fasterxml.jackson.core:jackson-core:2.12.3 (2 constraints: 3f21e893)
 com.fasterxml.jackson.core:jackson-databind:2.12.3 (4 constraints: 823cb16e)
 com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b)
-com.netflix.nebula:nebula-test:9.0.0 (1 constraints: 0b051836)
+com.netflix.nebula:nebula-test:10.0.0 (1 constraints: 3305273b)
 com.palantir.conjure.java:conjure-lib:6.1.0 (1 constraints: 09050c36)
 com.palantir.conjure.java.api:errors:2.19.0 (1 constraints: 2410a5a9)
 com.palantir.ri:resource-identifier:1.5.0 (1 constraints: ee0f7499)
@@ -110,18 +110,22 @@ javax.xml.bind:jaxb-api:2.3.1 (1 constraints: c0069559)
 junit:junit-dep:4.11 (1 constraints: ba1063b3)
 net.lingala.zip4j:zip4j:1.3.2 (1 constraints: 0805fb35)
 one.util:streamex:0.7.3 (1 constraints: 0c050336)
-org.apiguardian:apiguardian-api:1.1.0 (7 constraints: 8f790357)
+org.apiguardian:apiguardian-api:1.1.0 (9 constraints: c79df1f8)
+org.jetbrains:annotations:19.0.0 (1 constraints: 660d8f2c)
 org.jooq:jooq:3.15.1 (1 constraints: 3c05453b)
-org.junit:junit-bom:5.7.2 (8 constraints: ed87a278)
+org.junit:junit-bom:5.7.2 (12 constraints: 60c7a8b3)
 org.junit.jupiter:junit-jupiter:5.7.2 (2 constraints: 240e5859)
 org.junit.jupiter:junit-jupiter-api:5.7.2 (6 constraints: 6d5c3095)
 org.junit.jupiter:junit-jupiter-engine:5.7.2 (2 constraints: 1f17a43c)
 org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 (2 constraints: 240e5859)
 org.junit.jupiter:junit-jupiter-params:5.7.2 (2 constraints: 1f17a43c)
 org.junit.platform:junit-platform-commons:1.7.2 (3 constraints: eb29562b)
-org.junit.platform:junit-platform-engine:1.7.2 (3 constraints: 392a2f5d)
+org.junit.platform:junit-platform-engine:1.7.2 (4 constraints: 823c4ddb)
+org.junit.platform:junit-platform-launcher:1.7.2 (2 constraints: 101b5c4a)
+org.junit.platform:junit-platform-testkit:1.7.2 (1 constraints: 11097695)
 org.junit.vintage:junit-vintage-engine:5.7.2 (1 constraints: 15098a95)
 org.mockito:mockito-junit-jupiter:3.11.2 (1 constraints: 39053a3b)
-org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
+org.opentest4j:opentest4j:1.2.0 (3 constraints: c53224a1)
 org.reactivestreams:reactive-streams:1.0.3 (1 constraints: ef07e77b)
-org.spockframework:spock-core:1.3-groovy-2.4 (1 constraints: 7c10f3af)
+org.spockframework:spock-core:2.0-M4-groovy-3.0 (2 constraints: e822d65a)
+org.spockframework:spock-junit4:2.0-M4-groovy-3.0 (1 constraints: 25115ddf)

versions.props

@@ -20,7 +20,7 @@ com.puppycrawl.tools:checkstyle = 8.45.1
 # test deps
 com.fasterxml.jackson.*:* = 2.11.1
 com.github.stefanbirkner:system-rules = 1.19.0
-com.netflix.nebula:nebula-test = 9.0.0
+com.netflix.nebula:nebula-test = 10.0.0
 com.palantir.tokens:auth-tokens = 3.10.0
 com.palantir.conjure.java:conjure-lib = 6.1.0
 com.palantir.tritium:tritium-registry = 0.28.0