Make JRubyExec compatible with Gradle 4.2 - 4.9 (#366)

Author: ysb33r

base-plugin/build.gradle

@@ -30,8 +30,6 @@ ext {
 dependencies {
 
     compile project(':jruby-gradle-core-plugin')
-//    compile "org.eclipse.jetty:jetty-server:${jettyVersion}"
-//    compile "org.eclipse.jetty:jetty-webapp:${jettyVersion}"
     runtime('de.saumya.mojo:rubygems:0.2.3@war') {
         // we just want the war file on the classloader for the application
         // to find it and use the war-file from filesystem

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

@@ -2,15 +2,20 @@ import com.github.jrubygradle.JRubyExec
 
 apply plugin : 'com.github.jruby-gradle.base'
 
+configurations {
+    jrubyExec
+}
+
 dependencies {
     jrubyExec ':credit_card_validator:1.1.0@gem'
 }
 
-jruby {
-    defaultRepositories = false
-}
 
 task requiresGems( type : JRubyExec ) {
+    jruby {
+        gemConfiguration 'jrubyExec'
+    }
+
     script 'scripts/requiresGem.rb'
 }
 

base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecExtensionIntegrationSpec.groovy

@@ -155,144 +155,4 @@ class JRubyExecExtensionIntegrationSpec extends IntegrationSpecification {
     private String getBcprovVer() {
         testProperties.bcprovVersion
     }
-}
-
-/*
-class JRubyExecDelegateSpec extends Specification {
-    static final String ABS_FILE_PREFIX = System.getProperty('os.name').toLowerCase().startsWith('windows') ? 'C:' : ''
-
-    Project project
-    JRubyExecDelegate jred
-
-    void setup() {
-        project = ProjectBuilder.builder().build()
-        project.apply plugin: 'com.github.jruby-gradle.base'
-        jred = JRubyExecDelegate.createJRubyExecDelegate(project)
-    }
-
-    void "When just passing script, scriptArgs, jrubyArgs, expect local properties to be updated"() {
-        given:
-        def xplatformFileName = project.file('path/to/file')
-        xplatformFileName.parentFile.mkdirs()
-        xplatformFileName.text = ''
-        def cl = {
-            script 'path/to/file'
-            jrubyArgs 'c', 'd', '-S'
-            scriptArgs '-x'
-            scriptArgs '-y', '-z'
-            jrubyArgs 'a', 'b'
-            gemWorkDir 'path/to/file'
-        }
-        jred.configure(cl)
-
-        expect:
-        jred.passthrough.size() == 0
-        jred.script == xplatformFileName
-        jred._convertScriptArgs() == ['-x', '-y', '-z']
-        jred._convertJrubyArgs() == ['c', 'd', '-S', 'a', 'b']
-        jred.buildArgs() == ['-rjars/setup', 'c', 'd', '-S', 'a', 'b', xplatformFileName.toString(), '-x', '-y', '-z']
-        jred._convertGemWorkDir(project) == project.file('path/to/file')
-    }
-
-    void "When passing absolute file and absolute file, expect check for existence to be executed"() {
-        given:
-        def cl = {
-            script ABS_FILE_PREFIX + '/path/to/file'
-            jrubyArgs 'c', 'd', '-S'
-            scriptArgs '-x'
-            scriptArgs '-y', '-z'
-            jrubyArgs 'a', 'b'
-        }
-        cl.delegate = jred
-        cl.call()
-        when:
-        jred.buildArgs()
-
-        then:
-        thrown(InvalidUserDataException)
-    }
-
-    void "When just passing arbitrary javaexec, expect them to be stored"() {
-        given:
-        def cl = {
-            environment 'XYZ', '123'
-            executable '/path/to/file'
-            jvmArgs '-x'
-            jvmArgs '-y', '-z'
-        }
-        cl.delegate = jred
-        cl.call()
-
-        expect:
-        jred.valuesAt(0) == ['XYZ', '123']
-        jred.valuesAt(1) == '/path/to/file'
-        jred.valuesAt(2) == '-x'
-        jred.valuesAt(3) == ['-y', '-z']
-        jred.keyAt(0) == 'environment'
-        jred.keyAt(1) == 'executable'
-        jred.keyAt(2) == 'jvmArgs'
-        jred.keyAt(3) == 'jvmArgs'
-
-    }
-
-    void "When using a conditional, expect specific calls to be passed"() {
-        given:
-        def cl = {
-            if (condition == 1) {
-                jvmArgs '-x'
-            } else {
-                jvmArgs '-y'
-            }
-        }
-        cl.delegate = jred
-        cl.call()
-
-        expect:
-        jred.valuesAt(0) == parameter
-
-        where:
-        condition | parameter
-        1         | '-x'
-        5         | '-y'
-
-    }
-
-    void "Prevent main from being called"() {
-        when:
-        def cl = {
-            main 'some.class'
-        }
-        cl.delegate = jred
-        cl.call()
-
-        then:
-        thrown(UnsupportedOperationException)
-    }
-
-    void "Prevent args from being called"() {
-        when:
-        def cl = {
-            args '-x', '-y'
-        }
-        cl.delegate = jred
-        cl.call()
-
-        then:
-        thrown(UnsupportedOperationException)
-    }
-
-    void "Prevent setArgs from being called"() {
-        when:
-        def cl = {
-            setArgs '-x', '-y'
-        }
-        cl.delegate = jred
-        cl.call()
-
-        then:
-        thrown(UnsupportedOperationException)
-    }
-
-}
-
- */
+}

base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy

@@ -33,8 +33,6 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
     @IgnoreIf({ IntegrationSpecification.OFFLINE })
     void "Check if rack version gets resolved"() {
         setup:
-        //withDefaultRepositories()
-
         withPreamble """repositories.ruby.gems()
             jrubyPrepare.outputDir = '${pathAsUriStr(projectDir)}'.toURI()
         """
@@ -50,7 +48,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
         then:
         // since we need a version range in the setup the
         // resolved version here can vary over time
-        new File(projectDir, "gems/rack-1.5.5").exists()
+        new File(projectDir, "gems/rack-1.6.11").exists()
     }
 
     @IgnoreIf({ IntegrationSpecification.OFFLINE })

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

@@ -3,12 +3,14 @@ package com.github.jrubygradle
 import com.github.jrubygradle.api.core.JRubyAwareTask
 import com.github.jrubygradle.api.core.JRubyExecSpec
 import com.github.jrubygradle.internal.JRubyExecUtils
+import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.Optional
 import org.gradle.process.JavaExecSpec
+import org.gradle.util.GradleVersion
 
 import java.util.concurrent.Callable
 
@@ -45,9 +47,15 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
             jruby.gemConfiguration
         }
 
-        dependsOn(project.provider({ JRubyPluginExtension jpe ->
-            project.tasks.getByName(jpe.gemPrepareTaskName)
-        }.curry(this.jruby)))
+        if (GradleVersion.current() >= GradleVersion.version('4.10')) {
+            dependsOn(project.provider({ JRubyPluginExtension jpe ->
+                project.tasks.getByName(jpe.gemPrepareTaskName)
+            }.curry(this.jruby)))
+        } else {
+            project.afterEvaluate({ Task t, JRubyPluginExtension jpe ->
+                t.dependsOn(jpe.gemPrepareTaskName)
+            }.curry(this, this.jruby))
+        }
     }
 
     /** Script to execute.

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

@@ -114,18 +114,15 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
         setJrubyVersion(newDefaultVersion)
     }
 
-    /** Set this to false if you do not want the default set of repositories to be loaded.
-     *
-     * @since 0.1.1
-     */
-
     /** Legacy method for setting default repositories.
      *
      * @deprecated Default repositories are no longer set by default. People
      *   who still need to use this feature must explicitly call this method, but
      *   are encouraged to migrate to using the {@code repositories} block instead.
      *
      * @param value {@code true} to enabled default repositories
+     *
+     * @since 0.1.1
      */
     @Deprecated
     void setDefaultRepositories(boolean value) {
@@ -148,31 +145,6 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
         }
     }
 
-//    /** Resolves the currently configured Jars installation directory.
-//     *
-//     * @return Install directory as an absolute path
-//     * @since 0.1.16
-//     */
-//    @Deprecated
-//    File getJarInstallDir() {
-//        project.file(this.jarInstallDir).absoluteFile
-//    }
-//
-//    /** Sets the jar installation directory. Anything that can be passed to {@code project.file} can be
-//     * passed here as well.
-//     *
-//     * @param dir Directory (String, GString, File, Closure etc.)
-//     * @return The passed object.
-//     * @deprecated Setting a custom jarInstallDir can cause dependencies to
-//     *  overlap and unexpected behavior. Please use Configurations instead.
-//     *
-//     * @since 0.1.16
-//     */
-//    @Deprecated
-//    Object setJarInstallDir(Object dir) {
-//        this.jarInstallDir = dir
-//    }
-
     /** Clears the current list of resolution strategies.
      *
      * If done on a task it will break the link to any global reoslution strategies.
@@ -294,19 +266,6 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
         }
     }
 
-//    /**
-//     * Register a callback to be invoked when defaultVersion is updated
-//     *
-//     * NOTE: This is primarily meant for JRuby/Gradle plugin developers
-//     *
-//     * @param callback
-//     * @since 1.1.0
-//     */
-//    @Incubating
-//    void registerDefaultVersionCallback(Closure callback) {
-//        defaultVersionCallbacks.add(callback)
-//    }
-
     /** Return all of the resolution strategies that are related to this extension.
      *
      * @return List of resolution strategy actions to perform.
@@ -339,22 +298,6 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
         }
     }
 
-//    /** Directory for jrubyPrepare to install GEM dependencies into */
-//    @Deprecated
-//    private Object gemInstallDir
-//
-//    /** Directory for jrubyPrepare to install JAR dependencies into */
-//    @Deprecated
-//    private Object jarInstallDir
-
-//    /** List of callbacks to invoke when jruby.defaultVersion is modified */
-//    private final List<Closure> defaultVersionCallbacks = []
-//
-//    /** List of callbacks to invoke when jruby.execVersion is modified */
-//    private final List<Closure> execVersionCallbacks = []
-//
-//    private Boolean isExecVersionModified = false
-
     private void registerPrepareTask(final String configurationName) {
         JRubyPrepareUtils.registerPrepareTask(project, configurationName)
         this.gemPrepareTaskName = JRubyPrepareUtils.taskName(configurationName)