Merge pull request #318 from rtyler/new-jrub

Default to JRuby 9.1.14.0 which now has some nice Java 9 support 👏

Author: R. Tyler Croy

build.gradle

@@ -16,7 +16,7 @@ buildscript {
 apply plugin: 'idea'
 
 group = 'com.github.jruby-gradle'
-version = '1.6.0-SNAPSHOT'
+version = '1.6.0'
 defaultTasks 'check', 'assemble'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

gradle.properties

@@ -8,7 +8,7 @@ releaseBuild=false
 
 targetCompatibility=1.7
 sourceCompatibility=1.7
-jrubyVersion=9.1.12.0
+jrubyVersion=9.1.14.0
 jettyVersion=9.2.12.v20150709
 rubygemsProxy=http://rubygems.lasagna.io/proxy/maven/releases
 torqueboxProxy=http://rubygems-proxy.torquebox.org/releases

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-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip

jruby-gradle-base-plugin/build.gradle

@@ -61,7 +61,7 @@ dependencies {
 
     // NOTE: Leave this at .11 as it must be an older version. if
     // you change it here you will also need to update JRubyExecIntegrationSpec
-    integrationTestGems "org.jruby:jruby-complete:1.7.19"
+    integrationTestGems "org.jruby:jruby-complete:9.0.1.0"
 
     // NOTE: older jruby versions needs this for exec to work properly
     integrationTestGems "rubygems:jar-dependencies:0.1.15"

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

@@ -44,7 +44,7 @@ class JRubyExecIntegrationSpec extends Specification {
         given: "Version is set on the task"
         Configuration config
         final String configName = 'integ-exec-config'
-        final String newVersion = '1.7.19'
+        final String newVersion = '9.0.1.0'
         Pattern pattern = Pattern.compile(/.*(jruby-complete-.+.jar)/)
 
         when:
@@ -161,13 +161,11 @@ class JRubyExecIntegrationSpec extends Specification {
 
     def "Running a script that requires a gem, a separate JRuby and a separate configuration"() {
         given:
-        final String newVersion = '1.7.19'
+        final String newVersion = '9.0.1.0'
         assert project.jruby.execVersion != newVersion
         project.with {
             configurations.create('RubyWax')
             dependencies.add('RubyWax', VersionFinder.findDependency(FLATREPO, '', 'credit_card_validator', 'gem'))
-            // we need it from flatrepo and not from regular repo. needed only for jruby <1.7.20
-            dependencies.add('RubyWax', VersionFinder.findDependency(FLATREPO ,'rubygems', 'jar-dependencies', 'gem'))
             configure(execTask) {
                 script        "${TEST_SCRIPT_DIR}/requiresGem.rb"
                 standardOutput output
@@ -192,7 +190,7 @@ class JRubyExecIntegrationSpec extends Specification {
              * least one version of JRuby installed
              */
             jruby {
-                execVersion '1.7.19'
+                execVersion '9.0.1.0'
                 defaultRepositories false
             }
 

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/GemUtils.groovy

@@ -1,6 +1,5 @@
 package com.github.jrubygradle
 
-import com.github.jrubygradle.internal.JRubyExecUtils
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ResolvedArtifact
@@ -115,12 +114,6 @@ class GemUtils {
                      '--no-document',
                      '--local'
 
-                // Workaround for bug
-                if (JRubyExecUtils.jrubyJarVersion(jRubyClasspath) == '1.7.14') {
-                    project.logger.debug 'Gem installation: Working around bug in JRuby 1.7.14'
-                    environment HOME : project.gradle.gradleUserHomeDir.absolutePath
-                }
-
                 // Workaround for FFI bug that is seen on some Windows environments
                 if (System.getProperty('os.name').toLowerCase().startsWith('windows')) {
                     environment 'TMP' : System.env.TMP, 'TEMP' : System.env.TEMP

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy

@@ -88,7 +88,7 @@ class JRubyExec extends JavaExec implements JRubyExecTraits {
      * compatible with a specific version or when running a script with a different version that what will
      * be packaged.
      *
-     * @param version String in the form '1.7.13'
+     * @param version String in the form '9.0.1.0'
      * @since 0.1.18
      */
     void jrubyVersion(final String ver) {
@@ -100,7 +100,7 @@ class JRubyExec extends JavaExec implements JRubyExecTraits {
      * compatible with a specific version or when running a script with a different version that what will
      * be packaged.
      *
-     * @param version String in the form '1.7.13'
+     * @param version String in the form '9.0.1.0'
      */
     void setJrubyVersion(final String version) {
         customJRubyVersion = version

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy

@@ -7,7 +7,7 @@ import org.gradle.api.Project
  * Class providing the jruby{} DSL extension to the Gradle build script
  */
 class JRubyPluginExtension {
-    static final String DEFAULT_JRUBY_VERSION = '9.1.12.0'
+    static final String DEFAULT_JRUBY_VERSION = '9.1.14.0'
 
     /** The default version of jruby that will be used  */
     String defaultVersion = DEFAULT_JRUBY_VERSION

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy

@@ -176,11 +176,6 @@ class JRubyExecUtils {
         if (!(c.dependencies.find { it.name == JRUBY_COMPLETE })) {
             project.dependencies.add(configuration, "org.jruby:jruby-complete:${version}")
         }
-
-        if (version.startsWith('1.7.1')) {
-            project.dependencies.add(configuration,
-                    "rubygems:jar-dependencies:${JAR_DEPENDENCIES_VERSION}")
-        }
     }
 
 }

jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy

@@ -76,7 +76,7 @@ class JRubyExecSpec extends Specification {
 
     def "Changing the JRuby version with the default configuration"() {
         given:
-        final String newVersion = '1.7.11'
+        final String newVersion = '9.0.1.0'
         execTask.jrubyVersion = newVersion
 
         when:
@@ -90,7 +90,7 @@ class JRubyExecSpec extends Specification {
     def "Changing the jruby version on a JRubyExec task"() {
         given:
         final String configurationName = 'spock-ruby'
-        final String newVersion = '1.7.11'
+        final String newVersion = '9.0.1.0'
 
         when:
         project.configure(execTask) {