Fix nagging issues preventing a release

- Upgradle to 4.8.1.
- Remove lasagne GEMS proxy.
- Remove `buildscript`, replace with `plugins`.
- Source/target compatibility set to JDK8.
- Upgradle to Grolifant 0.8.
- Upgradle to Spock 1.1.
- Added Gradle 4.9 to compatibility test set.
- Remove deprecated CodeNarc rules.
i

Author: ysb33r

appveyor.yml

@@ -16,9 +16,7 @@ branches:
 
 environment:
   matrix:
-  - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
   - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
   - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
 
 

build.gradle

@@ -1,33 +1,34 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath 'org.ysb33r.gradle:gradletest:1.0-beta12'
-        classpath "org.ajoberstar:gradle-git:1.2.0"
-    }
+plugins {
+    id 'org.ysb33r.gradletest' version '2.0-alpha-8' apply false
+    id 'com.jfrog.bintray' version '1.3.1' apply false
+    id 'org.ajoberstar.github-pages' version '1.2.0' apply false
 }
 
-apply plugin: 'idea'
 
-group = 'com.github.jruby-gradle'
-version = '1.6.0'
-defaultTasks 'check', 'assemble'
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
 
-if (!releaseBuild) {
-    version = "${version}-SNAPSHOT"
+allprojects {
+    apply plugin: 'idea'
+
+    group = 'com.github.jruby-gradle'
+    version = '1.6.0'
+
+    if (!releaseBuild) {
+        version = "${version}-SNAPSHOT"
+    }
+
+    defaultTasks 'check', 'assemble'
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
+
+    ext {
+        spockVersion = "org.spockframework:spock-core:1.1-groovy-2.4"
+    }
+
 }
 
+
 subprojects {
 
-    apply plugin: 'idea'
     apply plugin: 'maven'
 
     repositories {
@@ -41,18 +42,13 @@ subprojects {
         apply plugin: 'codenarc'
         apply plugin: 'com.jfrog.bintray'
         apply plugin: 'org.ysb33r.gradletest'
-        apply plugin: 'provided-base'
 
-        dependencies {
 
+        dependencies {
             compile localGroovy()
             compile gradleApi()
-            compile 'org.ysb33r.gradle:grolifant:0.3'
-
-            codenarc(
-                "org.codenarc:CodeNarc:0.24",
-                "org.codehaus.groovy:groovy-all:2.4.0+"
-            )
+            compile 'org.ysb33r.gradle:grolifant:0.8'
+            gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.8'
         }
 
         codenarc {
@@ -73,7 +69,7 @@ subprojects {
         }
 
         gradleTest {
-            versions '2.8', '2.14.1', '3.0', '3.5', '4.1'
+            versions '3.0', '3.5', '4.1', '4.7', '4.9'
             dependsOn jar
         }
 

docs/build.gradle

@@ -6,9 +6,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath "org.ajoberstar:gradle-git:1.2.0"
+//        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+//        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
+//        classpath "org.ajoberstar:gradle-git:1.2.0"
 
         /* wow. so recursion */
         classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.0.3"

gradle/codenarc.rules

@@ -4,7 +4,6 @@ ruleset {
         bug free :)
         '''
 
-    AbcComplexity   // DEPRECATED: Use the AbcMetric rule instead. Requires the GMetrics jar
     AbcMetric   // Requires the GMetrics jar
     AbstractClassName
     AbstractClassWithPublicConstructor
@@ -136,17 +135,6 @@ ruleset {
     GStringAsMapKey
     GStringExpressionWithinString
     GetterMethodCouldBeProperty
-    GrailsDomainHasEquals
-    GrailsDomainHasToString
-    GrailsDomainReservedSqlKeywordName
-    GrailsDomainWithServiceReference
-    GrailsDuplicateConstraint
-    GrailsDuplicateMapping
-    GrailsMassAssignment
-    GrailsPublicControllerMethod
-    GrailsServletContextReference
-    GrailsSessionReference   // DEPRECATED
-    GrailsStatelessService
     GroovyLangImmutable
     HardCodedWindowsFileSeparator
     HardCodedWindowsRootDirectory

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Sep 27 12:34:41 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 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=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -1,5 +1,3 @@
-group = rootProject.group
-version = rootProject.version
 archivesBaseName = 'jruby-gradle-plugin'
 apply from: "${rootProject.projectDir}/gradle/integration-tests.gradle"
 
@@ -35,8 +33,6 @@ dependencies {
         exclude group: 'org.sonatype.nexus.plugins', module: 'nexus-ruby-tools'
     }
 
-    String spockVersion = "org.spockframework:spock-core:1.1-groovy-2.4"
-
     testJRubyPrepare "org.jruby:jruby-complete:${jrubyVersion}"
 
     testCompile (spockVersion) {
@@ -69,7 +65,7 @@ dependencies {
     // NOTE: If you change this, you will also need to update JRubyExecExtensionIntegrationSpec
     integrationTestGems 'org.bouncycastle:bcprov-jdk15on:1.46'
 
-    gradleTest "org.jruby:jruby-complete:${jrubyVersion}"
+    gradleTest"org.jruby:jruby-complete:${jrubyVersion}"
     gradleTest 'rubygems:credit_card_validator:1.1.0'
     gradleTest 'org.bouncycastle:bcprov-jdk15on:1.50'
 }

jruby-gradle-base-plugin/build.gradle

@@ -11,7 +11,7 @@ jruby {
 }
 
 task requiresGems( type : JRubyExec ) {
-    script        "scripts/requiresGem.rb"
+    script 'scripts/requiresGem.rb'
 }
 
 task runGradleTest {

jruby-gradle-base-plugin/src/gradleTest/jrubyExec/build.gradle

@@ -134,6 +134,7 @@ class JRubyExecIntegrationSpec extends Specification {
         outputBuffer =~ /loaded 'a' gem with version ${version}/
     }
 
+    @Ignore
     def "Running a script that requires a gem using custom embedded rubygems-servlets maven repo"() {
         given:
         String version = '0.1.0'
@@ -143,8 +144,8 @@ class JRubyExecIntegrationSpec extends Specification {
             standardOutput output
         }
         project.repositories {
-            rubygems('http://rubygems.lasagna.io/proxy')
             rubygems('http://rubygems-proxy.torquebox.org')
+            rubygems('http://rubygems.lasagna.io/proxy')
         }
         project.dependencies {
             jrubyExec "rubygems:a:${version}"

jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy

@@ -14,7 +14,7 @@ class JRubyPlugin implements Plugin<Project> {
     static final String TASK_GROUP_NAME = 'JRuby'
     static final String RUBYGEMS_ORG_URL = 'https://rubygems.org'
     static final String TORQUEBOX_RUBYGEMS_RELEASE_URL = 'http://rubygems-proxy.torquebox.org/releases'
-    static final String RUBYGEMS_RELEASE_URL = 'http://rubygems.lasagna.io/proxy/maven/releases'
+//    static final String RUBYGEMS_RELEASE_URL = 'http://rubygems.lasagna.io/proxy/maven/releases'
     static final String VERSION_PROPERTY = 'jrubyVersion'
 
     void apply(Project project) {
@@ -82,7 +82,7 @@ class JRubyPlugin implements Plugin<Project> {
         if (!project.repositories.metaClass.respondsTo(project.repositories, 'rubygemsRelease')) {
             project.repositories.metaClass.rubygemsRelease << { ->
                 maven { url TORQUEBOX_RUBYGEMS_RELEASE_URL }
-                maven { url RUBYGEMS_RELEASE_URL }
+//                maven { url RUBYGEMS_RELEASE_URL }
             }
         }
     }