diff --git a/build.gradle b/build.gradle index 48a1f6513f..f63ac8f0dc 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2' // This restriction is needed due to our mix of Android and Java modules; // without it, the build fails with a weird error. @@ -37,7 +37,7 @@ buildscript { plugins { id "com.github.sherter.google-java-format" version "0.9" id "net.ltgt.errorprone" version "3.0.1" apply false - id "com.github.johnrengelman.shadow" version "6.1.0" apply false + id "com.github.johnrengelman.shadow" version "8.1.0" apply false id "com.github.kt3k.coveralls" version "2.12.0" apply false id "me.champeau.jmh" version "0.6.8" apply false id "com.github.ben-manes.versions" version "0.42.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa7..ccebba7710 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c4b..bdc9a83b1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d65..79a61d421c 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/jar-infer/jar-infer-cli/build.gradle b/jar-infer/jar-infer-cli/build.gradle index 673209a084..0b242595be 100644 --- a/jar-infer/jar-infer-cli/build.gradle +++ b/jar-infer/jar-infer-cli/build.gradle @@ -36,7 +36,7 @@ jar { shadowJar { mergeServiceFiles() configurations = [project.configurations.runtimeClasspath] - classifier = null + archiveClassifier = "" } shadowJar.dependsOn jar assemble.dependsOn shadowJar @@ -67,12 +67,8 @@ publishing { // Since we are skipping the default maven publication, we append the `:sources` and // `:javadoc` artifacts here. They are also required for Maven Central validation. afterEvaluate { - artifact project.sourcesJar { - classifier "sources" - } - artifact project.javadocsJar { - classifier "javadoc" - } + artifact project.sourcesJar + artifact project.javadocsJar } // The shadow publication does not auto-configure the pom.xml file for us, so we need to // set it up manually. We use the opportunity to change the name and description from diff --git a/jar-infer/test-java-lib-jarinfer/build.gradle b/jar-infer/test-java-lib-jarinfer/build.gradle index a6106f305e..7e60265438 100644 --- a/jar-infer/test-java-lib-jarinfer/build.gradle +++ b/jar-infer/test-java-lib-jarinfer/build.gradle @@ -36,7 +36,7 @@ jar.doLast { javaexec { classpath = files("${rootProject.projectDir}/jar-infer/jar-infer-cli/build/libs/jar-infer-cli-${VERSION_NAME}.jar") main = "com.uber.nullaway.jarinfer.JarInfer" - args = ["-i", jar.archivePath, "-o", "${jar.destinationDir}/${astubxPath}"] + args = ["-i", jar.archiveFile.get(), "-o", "${jar.destinationDirectory.get()}/${astubxPath}"] } exec { workingDir "./build/libs"