Merge pull request #130 from vlsi/gradle_63

Upgrade Gradle: 6.1.1 -> 6.3

build.gradle.kts

@@ -1,6 +1,8 @@
 import com.github.vlsi.gradle.crlf.CrLfSpec
 import com.github.vlsi.gradle.crlf.LineEndings
 import com.github.vlsi.gradle.properties.dsl.props
+import com.github.vlsi.gradle.publishing.dsl.simplifyXml
+import com.github.vlsi.gradle.publishing.dsl.versionFromResolution
 
 plugins {
     id("com.github.vlsi.crlf")
@@ -187,37 +189,9 @@ allprojects {
                     // Use the resolved versions in pom.xml
                     // Gradle might have different resolution rules, so we set the versions
                     // that were used in Gradle build/test.
-                    versionMapping {
-                        usage(Usage.JAVA_RUNTIME) {
-                            fromResolutionResult()
-                        }
-                        usage(Usage.JAVA_API) {
-                            fromResolutionOf("runtimeClasspath")
-                        }
-                    }
+                    versionFromResolution()
                     pom {
-                        withXml {
-                            val sb = asString()
-                            var s = sb.toString()
-                            // <scope>compile</scope> is Maven default, so delete it
-                            s = s.replace("<scope>compile</scope>", "")
-                            // Cut <dependencyManagement> because all dependencies have the resolved versions
-                            s = s.replace(
-                                Regex(
-                                    "<dependencyManagement>.*?</dependencyManagement>",
-                                    RegexOption.DOT_MATCHES_ALL
-                                ),
-                                ""
-                            )
-                            sb.setLength(0)
-                            sb.append(s)
-                            if (generatePomFile && !version.endsWith("SNAPSHOT")) {
-                                file("$projectDir/pom.xml").writeText(sb.toString())
-                            }
-                            // Re-format the XML
-                            asNode()
-                        }
-
+                        simplifyXml()
 
                         description.set(
                             project.description

gradle.properties

@@ -11,7 +11,7 @@ darklaf.version                                           = 1.4.3.1
 
 # Plugins
 shadow.version                                            = 5.1.0
-com.github.vlsi.vlsi-release-plugins.version              = 1.54
+com.github.vlsi.vlsi-release-plugins.version              = 1.70
 com.github.johnrengelman.shadow.version                   = 5.1.0
 
 # Dependencies

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-distributionSha256Sum=10065868c78f1207afb3a92176f99a37d753a513dff453abb6b5cceda4058cda
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

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"