Bump to Gradle 6.0.1

devtools/gradle/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-    id 'com.gradle.build-scan' version '2.3'
     id 'com.gradle.plugin-publish' version '0.10.1'
     id 'java-gradle-plugin'
 }
@@ -19,20 +18,20 @@ repositories {
     mavenCentral()
 }
 
-// Add a source set for the integration test suite
+// Add a source set for the functional test suite
 sourceSets {
     functionalTest {
     }
 }
 
 dependencies {
-    compile "io.quarkus:quarkus-bootstrap-core:${version}"
-    compile "io.quarkus:quarkus-devtools-common:${version}"
-    compile "io.quarkus:quarkus-platform-descriptor-json:${version}"
-    compile "io.quarkus:quarkus-platform-descriptor-resolver-json:${version}"
-    compile "io.quarkus:quarkus-development-mode:${version}"
-    compile "io.quarkus:quarkus-creator:${version}"
-    compile gradleApi()
+    api gradleApi()
+    implementation "io.quarkus:quarkus-bootstrap-core:${version}"
+    implementation "io.quarkus:quarkus-devtools-common:${version}"
+    implementation "io.quarkus:quarkus-platform-descriptor-json:${version}"
+    implementation "io.quarkus:quarkus-platform-descriptor-resolver-json:${version}"
+    implementation "io.quarkus:quarkus-development-mode:${version}"
+    implementation "io.quarkus:quarkus-creator:${version}"
 
     testImplementation 'org.assertj:assertj-core:3.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
@@ -69,7 +68,4 @@ gradlePlugin {
 }
 
 buildScan {
-    //See also: https://docs.gradle.com/build-scan-plugin/
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service';
-    termsOfServiceAgree = 'yes'
-}
+}

devtools/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-#Tue Nov 05 11:34:08 BRST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+#Tue Nov 26 00:14:48 BRST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

devtools/gradle/gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

devtools/gradle/pom.xml

@@ -21,30 +21,7 @@
         <skip.gradle.build>false</skip.gradle.build>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>gradle-official-repository</id>
-            <name>Gradle Official Repository</name>
-            <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
-        <!-- Special -->
-        <!-- NOT <scope>import</scope> because this is for the maven-dependency-plugin -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-
         <!-- Compile -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -70,11 +47,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

devtools/gradle/settings.gradle

@@ -1 +1,14 @@
+plugins {
+    id "com.gradle.enterprise" version "3.1"
+}
+
+gradleEnterprise {
+    buildScan {
+        // plugin configuration
+        //See also: https://docs.gradle.com/enterprise/gradle-plugin/
+        termsOfServiceUrl = 'https://gradle.com/terms-of-service';
+        termsOfServiceAgree = 'yes'
+    }
+}
+
 rootProject.name = 'quarkus-gradle-plugin'

devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java

@@ -100,8 +100,8 @@ public class QuarkusPlugin implements Plugin<Project> {
     }
 
     private void verifyGradleVersion() {
-        if (GradleVersion.current().compareTo(GradleVersion.version("5.0")) < 0) {
-            throw new GradleException("Quarkus plugin requires Gradle 5.0 or later. Current version is: " +
+        if (GradleVersion.current().compareTo(GradleVersion.version("6.0")) < 0) {
+            throw new GradleException("Quarkus plugin requires Gradle 6.0 or later. Current version is: " +
                     GradleVersion.current());
         }
     }

devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java

@@ -233,6 +233,7 @@ public class QuarkusNative extends QuarkusTask {
         this.dumpProxies = dumpProxies;
     }
 
+    @Optional
     @Input
     public String getNativeImageXmx() {
         return nativeImageXmx;