Merge pull request #378 from SUPERCILEX/perf

Upgrade deps and use @CompileStatic everywhere

build.gradle

@@ -9,8 +9,7 @@ buildscript {
 }
 
 plugins {
-  id "com.gradle.build-scan" version "1.16"
-  id "com.jfrog.bintray" version "1.7.3"
+  id "com.jfrog.bintray" version "1.8.4"
 }
 
 buildScan {
@@ -26,12 +25,16 @@ apply plugin: 'codenarc'
 group = 'com.github.ben-manes'
 version = '0.27.0'
 
-sourceCompatibility = '1.6'
+sourceCompatibility = '1.8'
 
 repositories {
   mavenCentral()
 }
 
+tasks.wrapper {
+  distributionType 'all'
+}
+
 codenarcMain {
   configFile = file('config/codenarc/rules.groovy')
 }
@@ -49,42 +52,40 @@ tasks.withType(CodeNarc) { codeNarcTask ->
 }
 
 dependencies {
-  compile gradleApi()
-  compile localGroovy()
+  implementation gradleApi()
 
-  compile 'com.thoughtworks.xstream:xstream:1.4.10'
-  testCompile gradleTestKit()
-  testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+  implementation 'com.thoughtworks.xstream:xstream:1.4.10'
+  testImplementation gradleTestKit()
+  testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
     exclude(module: 'groovy-all')
   }
 }
 
 // Write the plugin's classpath to a file to share with the tests
 task createClasspathManifest {
-    def outputDir = file("$buildDir/$name")
+  def outputDir = file("$buildDir/$name")
 
-    inputs.files sourceSets.main.runtimeClasspath
-    outputs.dir outputDir
+  inputs.files sourceSets.main.runtimeClasspath
+  outputs.dir outputDir
 
-    doLast {
-        outputDir.mkdirs()
-        file("$outputDir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join("\n")
-    }
+  doLast {
+    outputDir.mkdirs()
+    file("$outputDir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join("\n")
+  }
 }
 
 // Add the classpath file to the test runtime classpath
 dependencies {
-    testRuntime files(createClasspathManifest)
+  testRuntimeOnly files(createClasspathManifest)
 }
 
 jar {
   manifest {
-      attributes 'Implementation-Title': 'Gradle Versions plugin',
-                 'Implementation-Version': version,
-                 'Built-By': System.getProperty('user.name'),
-                 'Built-Date': new Date(),
-                 'Built-JDK': System.getProperty('java.version'),
-                 'Built-Gradle': gradle.gradleVersion
+    attributes 'Implementation-Title': 'Gradle Versions plugin',
+      'Implementation-Version': version,
+      'Built-By': System.getProperty('user.name'),
+      'Built-JDK': System.getProperty('java.version'),
+      'Built-Gradle': gradle.gradleVersion
   }
 }
 
@@ -97,8 +98,12 @@ artifacts {
   archives groovydocJar
 }
 
-tasks.withType(Test){
+tasks.withType(Test) {
+  maxParallelForks Runtime.getRuntime().availableProcessors()
+
   testLogging {
+    events "passed", "failed", "skipped"
+    showStandardStreams true
     exceptionFormat "full"
   }
 }
@@ -144,15 +149,15 @@ modifyPom {
 }
 
 bintray {
-    user = 'fooberger'
-    key = System.env.bintrayAPIKey
-    configurations = ['archives']
-    publish = true
-    pkg {
-        repo = 'maven'
-        name = 'com.github.ben-manes:gradle-versions-plugin'
-        version {
-          attributes = ['gradle-plugin' : 'com.github.ben-manes.versions:com.github.ben-manes:gradle-versions-plugin']
-        }
+  user = 'fooberger'
+  key = System.env.bintrayAPIKey
+  configurations = ['archives']
+  publish = true
+  pkg {
+    repo = 'maven'
+    name = 'com.github.ben-manes:gradle-versions-plugin'
+    version {
+      attributes = ['gradle-plugin': 'com.github.ben-manes.versions:com.github.ben-manes:gradle-versions-plugin']
     }
+  }
 }

examples/groovy/settings.gradle

@@ -1,3 +1 @@
 rootProject.name = 'gradle-versions-sample-groovy'
-enableFeaturePreview("IMPROVED_POM_SUPPORT")
-

examples/kotlin/build.gradle.kts

@@ -1,10 +1,19 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
-// Use 'gradle install' to install latest plugin version
-plugins {
-  id("com.github.ben-manes.versions") version "0.25.0"
+buildscript {
+  repositories {
+    // Use 'gradle install' to install latest
+    mavenLocal()
+    jcenter()
+  }
+
+  dependencies {
+    classpath("com.github.ben-manes:gradle-versions-plugin:+")
+  }
 }
 
+apply(plugin = "com.github.ben-manes.versions")
+
 repositories {
   jcenter()
 }

examples/kotlin/settings.gradle.kts

@@ -1,11 +1 @@
-@file:Suppress("UnstableApiUsage")
-
-// Use 'gradle install' to install latest plugin version
-pluginManagement {
-  repositories {
-    mavenLocal()
-    gradlePluginPortal()
-  }
-}
 rootProject.name = "gradle-versions-sample-kotlin"
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; 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
 
@@ -159,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" "$@"