Upgrade Gradle to 6.3

diff --git a/build.gradle b/build.gradle
index b126bcb099ccddf874c3a8da575de1155e9d5b69..a00c098422cec6f640d2ed5f00c58503a850cda9 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -476,6 +476,10 @@ subprojects {
     includes(['**/*.java', '**/*.js', '**/*.ts', '**/*.tsx', '**/*.css'])
   }
 
+  tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+  }
+
   publishing {
     publications {
       mavenJava(MavenPublication) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 70b991a98de133f1193049a6c3fda72869e9931c..4c699f5aeb41da80b56acd9a984c89c73b068f21 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 09d4a813a76eeb0290aef701003637a8a24fb87e..63f620882f65135647b979004a2737b5a3135d19 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -148,7 +148,7 @@ task zip(type: Zip, dependsOn: [configurations.compile]) {
     from(tasks.getByPath(':server:sonar-web:yarn_run').outputs) { a ->
       if (official) {
          project(':private:branding').fileTree('src').visit { b ->
-           if (!b.isDirectory) {
+           if (!b.isDirectory()) {
              a.exclude b.relativePath.toString()
            }
          }