Upgrade to Gradle 6.4

Closes spring-projectsgh-25020
yhllow · May 6, 2020 · b1c1a23 · b1c1a23
1 parent 1b85f62
commit b1c1a23
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -325,7 +325,7 @@ configure([rootProject] + javaProjects) { project ->
 
 	checkstyle {
 		toolVersion = "8.31"
-		configDir = rootProject.file("src/checkstyle")
+		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
 	dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
@@ -21,16 +21,16 @@ configurations {
 }
 
 task cglibRepackJar(type: ShadowJar) {
-	baseName = 'spring-cglib-repack'
-	version = cglibVersion
+	archiveBaseName = 'spring-cglib-repack'
+	archiveVersion = cglibVersion
 	configurations = [project.configurations.cglib]
 	relocate 'net.sf.cglib', 'org.springframework.cglib'
 	relocate 'org.objectweb.asm', 'org.springframework.asm'
 }
 
 task objenesisRepackJar(type: ShadowJar) {
-	baseName = 'spring-objenesis-repack'
-	version = objenesisVersion
+	archiveBaseName = 'spring-objenesis-repack'
+	archiveVersion = objenesisVersion
 	configurations = [project.configurations.objenesis]
 	relocate 'org.objenesis', 'org.springframework.objenesis'
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*

		set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


		@rem Execute Gradle
		"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

Expand Down