Upgrade to Gradle 6.2 (#51824)

mark-vieira · mark-vieira · commit 66bb9c3c2cb3 · 2020-02-18T15:35:39.000-08:00
diff --git a/buildSrc/src/main/resources/minimumGradleVersion b/buildSrc/src/main/resources/minimumGradleVersion
@@ -1 +1 @@
-6.1.1
+6.2
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
@@ -52,7 +52,7 @@ import java.util.regex.Pattern
  */
 
 plugins {
-  id "nebula.ospackage-base" version "8.0.3"
+  id "nebula.ospackage-base" version "8.1.0"
 }
 
 void addProcessFilesTask(String type, boolean oss, boolean jdk) {
diff --git 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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=10065868c78f1207afb3a92176f99a37d753a513dff453abb6b5cceda4058cda
+distributionSha256Sum=f016e66d88c2f9adb5b6e7dff43a363b8c2632f18b4ad6f365f49da34dd57db8
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ import java.util.regex.Pattern`
`52`	`52`	`*/`
`53`	`53`
`54`	`54`	`plugins {`
`55`		`- id "nebula.ospackage-base" version "8.0.3"`
	`55`	`+ id "nebula.ospackage-base" version "8.1.0"`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`void addProcessFilesTask(String type, boolean oss, boolean jdk) {`