diff --git a/build.gradle b/build.gradle index 61c986ea790..dd772c11569 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ plugins { id 'net.ltgt.apt' version '0.19' apply false id 'net.ltgt.errorprone' version '0.6.1' id 'checkstyle' - id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'com.github.johnrengelman.shadow' version '5.1.0' // NodeJs plugin id "com.moowork.node" version "1.2.0" @@ -162,8 +162,8 @@ subprojects { attributes 'Main-Class': mainClass } zip64 = true - classifier = null - version = null + classifier = '' + archiveVersion = '' configurations = [project.configurations.runtimeClasspath] from project.sourceSets.main.output // Excludes signature files that accompany some dependency jars, like diff --git a/gradle.properties b/gradle.properties index 2df3cf760db..67a38dd16d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +org.gradle.jvmargs=-Xmx1024m mavenUrl= pluginsUrl= uploaderDestination= diff --git a/gradle/dependency-locks/buildscript-classpath.lockfile b/gradle/dependency-locks/buildscript-classpath.lockfile index b15604eb946..41f8050a41d 100644 --- a/gradle/dependency-locks/buildscript-classpath.lockfile +++ b/gradle/dependency-locks/buildscript-classpath.lockfile @@ -9,8 +9,8 @@ com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.18.0 com.diffplug.spotless:spotless-lib-extra:1.18.0 com.diffplug.spotless:spotless-lib:1.18.0 com.diffplug.spotless:spotless-plugin-gradle:3.18.0 -com.github.jengelman.gradle.plugins:shadow:5.0.0 -com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.0.0 +com.github.jengelman.gradle.plugins:shadow:5.1.0 +com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.1.0 com.google.cloud.tools:appengine-gradle-plugin:2.0.1 com.google.cloud.tools:appengine-plugins-core:0.7.5 com.google.code.findbugs:jsr305:3.0.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 430dfabc5c4..9001ba0058d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://storage.googleapis.com/domain-registry-dev-deploy/gradle/gradle-5.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/prober/gradle/dependency-locks/buildscript-classpath.lockfile b/prober/gradle/dependency-locks/buildscript-classpath.lockfile new file mode 100644 index 00000000000..656c5dbccf1 --- /dev/null +++ b/prober/gradle/dependency-locks/buildscript-classpath.lockfile @@ -0,0 +1,3 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control.