Upgrade to gradle6

acoburn · acoburn · commit 91f75cb20abf · 2020-01-07T15:28:46.000-05:00
Resolves #625
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'com.github.hierynomus.license' version "$licenseVersion"
     id 'com.github.kt3k.coveralls' version "$coverallsVersion"
     id 'com.github.spotbugs' version "$spotbugsVersion"
-    id 'com.gradle.build-scan' version "$scanVersion"
     id 'net.researchgate.release' version "$releasesVersion"
     id 'org.owasp.dependencycheck' version "$owaspVersion"
     id 'org.sonarqube' version "$sonarVersion"
@@ -371,6 +370,10 @@ subprojects { subproj ->
         sign publishing.publications
     }
 
+    tasks.withType(Sign) {
+        onlyIf { !version.endsWith("SNAPSHOT") }
+    }
+
     processResources {
         outputs.upToDateWhen { false }
         filesMatching(['**/features.xml', '**/banner.txt']) {
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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platform/bom/build.gradle b/platform/bom/build.gradle
@@ -52,6 +52,10 @@ publishing {
     }
 }
 
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
 java {
     // because this isn't built as a JPMS module
     if (project.hasProperty("jpms") && JavaVersion.current().isJava11Compatible()) {
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id "com.gradle.enterprise" version "$scanVersion"
+}
+
 rootProject.name = 'trellis'
 
 include ':trellis-api'

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ publishing {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
	`55`	`+tasks.withType(GenerateModuleMetadata) {`
	`56`	`+ enabled = false`
	`57`	`+}`
	`58`	`+`
`55`	`59`	`java {`
`56`	`60`	`// because this isn't built as a JPMS module`
`57`	`61`	`if (project.hasProperty("jpms") && JavaVersion.current().isJava11Compatible()) {`