chore: Upgrade to Gradle 6.0 as the project minimum.

John Engelman · John Engelman · commit 43a8d4e8ea5d · 2020-03-07T09:11:37.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -18,15 +18,16 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '2.1'
     id 'groovy'
     id 'project-report'
     id 'idea'
     id 'java-gradle-plugin'
 }
 
 // Remove the gradleApi so it isn't merged into the jar file.
-configurations.compile.dependencies.remove dependencies.gradleApi()
+configurations.named(JavaPlugin.API_CONFIGURATION_NAME) {
+    dependencies.remove(project.dependencies.gradleApi())
+}
 
 gradlePlugin {
     automatedPublishing = false
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -16,7 +16,7 @@ File projectBuildFile = file('../gradle/dependencies.gradle')
 
 //Use this parse command because Groovy wants to use the file name as the classname
 //which fails if your Gradle build file has been renamed to contain an invalid character (i.e. '-')
-DelegatingScript script = (DelegatingScript)sh.parse(projectBuildFile.text.replaceAll('shadow', 'compile'), 'GradlePlugins')
+DelegatingScript script = (DelegatingScript)sh.parse(projectBuildFile.text.replaceAll('shadow', 'implementation'), 'GradlePlugins')
 script.setDelegate(holder)
 
 //Resolve the project main Gradle file against our ScriptHolder
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-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,5 @@
-rootProject.name = 'shadow'
+plugins {
+    id 'com.gradle.enterprise' version '3.1.1'
+}
+
+rootProject.name = 'shadow'
diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md
@@ -1,4 +1,13 @@
 # Change Log
+## v6.0.0 (2020-03-07)
+* Required Gradle 6.0+
+* Fix Gradle 7 deprecation warnings [#530](https://github.com/johnrengelman/shadow/issues/530)
+* [Yahor Berdnikau](https://github.com/Tapchicoma) - Fix issues with Gradle API being embedded into published JAR [#527](https://github.com/johnrengelman/shadow/issues/527)
+* [Dmitry Vyazelenko](https://github.com/vyazelenko) - ASM updates to support latest Java verisons [#549](https://github.com/johnrengelman/shadow/pull/549)
+* [ejjcase](https://github.com/ejjcase) - Support exposing shadowed project dependencies via POM [#543](https://github.com/johnrengelman/shadow/pull/543)
+* [Artem Chubaryan](https://github.com/Armaxis) - Performance optimizations [#535](https://github.com/johnrengelman/shadow/pull/535)
+* [Trask Stalnaker](https://github.com/trask) - Fix exclude patterns on Windows [#539](https://github.com/johnrengelman/shadow/pull/539)
+
 ## v5.2.0 (2019-11-10)
 * [Inez Korczyński](https://github.com/inez) - Performance optimization when evaluating relocation paths [#507](https://github.com/johnrengelman/shadow/pull/507)
 * [Jeff Adler](https://github.com/jeffalder) - Fix remapping issues with multi release JARS [#526](https://github.com/johnrengelman/shadow/pull/526)
diff --git a/src/main/resources/shadow-version.txt b/src/main/resources/shadow-version.txt
@@ -1 +1 @@
-5.2.0
+6.0.0
diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy
@@ -86,13 +86,13 @@ class ShadowPluginSpec extends PluginSpecification {
         assert output.exists()
 
         where:
-        version << ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '6.0']
+        version << ['6.0', '6.1', '6.2']
     }
 
-    def 'Error in Gradle versions < 5.0'() {
+    def 'Error in Gradle versions < 6.0'() {
         given:
         GradleRunner versionRunner = GradleRunner.create()
-                .withGradleVersion('4.5')
+                .withGradleVersion('5.5')
                 .withArguments('--stacktrace')
                 .withProjectDir(dir.root)
                 .forwardOutput()
