Merge pull request #354 from rtyler/remove-1.7-319

Remove support for JRuby 1.7 compatibility

Author: rtyler

README.adoc

@@ -9,12 +9,16 @@ image::https://badges.gitter.im/Join%20Chat.svg[link="https://gitter.im/jruby-gr
 
 You can also join us on the link:https://groups.google.com/forum/#!forum/jruby-gradle[JRuby/Gradle mailing list]
 
-The purpose of these plugins is to bundle useful link:http://gradle.org[Gradle]
-functionality for JRuby projects. Use of this plugin replaces the need for both link:http://bundler.io[Bundler] and link:https://github.com/jruby/warbler[Warbler].
+JRuby/Gradle brings the power and flexibility of 
+link:http://gradle.org[Gradle]
+to the Ruby ecosystem! With JRuby/Gradle you can specify your Java and Ruby dependencies together, build jar files, run tests, and much more!.
 
 
-The Ruby gem dependency code for this project relies on the link:http://rubygems.lasagna.io/proxy/maven/releases[Rubygems Maven
-proxy] operated by link:https://github.com/rtyler[R. Tyler Croy]
+Use of this plugin replaces the need for Rake, link:http://bundler.io[Bundler]
+and link:https://github.com/jruby/warbler[Warbler].
+
+
+NOTE: JRuby/Gradle 2.0 relies on JRuby 9.x and later.
 
 
 This repository contains the:
@@ -24,5 +28,4 @@ This repository contains the:
 * `war` (in `jruby-gradle-war-plugin/`): packaging JRuby-based `.war` files
 
 
-
 NOTE: More documentation can be found on link:http://jruby-gradle.org[jruby-gradle.org]

docs/base.adoc

@@ -2,4 +2,4 @@
 :page-layout: base
 :toc: right
 
-include::./../jruby-gradle-base-plugin/README.adoc[]
+include::./../base-plugin/README.adoc[]

docs/errors/jar-deprecated-jrubyversion.adoc

@@ -10,6 +10,9 @@ JRuby in an "embedded" scenario more reliable. Packing a `JRubyJar` being a
 fairly typical "embedded JRuby" use-case, there is certain functionality that
 relies on these improvements.
 
+
+NOTE: As of JRuby/Gradle 2.0.0, the JRuby 1.7.x releases are no longer supported.
+
 This does **not** mean older versions of JRuby won't work in `JRubyJar`
 archives but rather: you are _likely_ going to experience problems with a more
 complex use-case on an older JRuby. For example, Rails applications will not

docs/index.adoc

@@ -10,7 +10,7 @@ link:http://jruby.org[JRuby] with Gradle's excellent task and dependency
 management, *JRuby/Gradle* provides high quality build tooling for
 Ruby and Java developers alike.
 
-NOTE: As from version 1.6.0 you will need at last Gradle 2.8.
+NOTE: As from version 2.0.0 you will need at least Gradle 4.2.
 
 *Plugins available:*
 

docs/jar.adoc

@@ -2,4 +2,4 @@
 :page-layout: base
 :toc: right
 
-include::./../jruby-gradle-jar-plugin/README.adoc[]
+include::./../jar-plugin/README.adoc[]

docs/start.adoc

@@ -2,4 +2,4 @@
 :page-layout: base
 :toc: right
 
-include::./../jruby-gradle-war-plugin/README.adoc[]
+include::./../war-plugin/README.adoc[]

docs/war.adoc

@@ -68,7 +68,6 @@ class JRubyJar extends Jar {
     void jrubyVersion(String version) {
         logger.info("setting jrubyVersion to ${version} from ${embeddedJRubyVersion}")
         embeddedJRubyVersion = version
-        addEmbeddedDependencies(project.configurations.getByName(configuration))
     }
 
     /**
@@ -94,7 +93,6 @@ class JRubyJar extends Jar {
     void jrubyMainsVersion(String version) {
         logger.info("setting jrubyMainsVersion to ${version} from ${embeddedJRubyMainsVersion}")
         embeddedJRubyMainsVersion = version
-        addEmbeddedDependencies(project.configurations.getByName(configuration))
     }
 
     /**
@@ -241,7 +239,6 @@ class JRubyJar extends Jar {
 
     JRubyJar() {
         appendix = 'jruby'
-        addEmbeddedDependencies(project.configurations.maybeCreate(DEFAULT_JRUBYJAR_CONFIG))
         /* Make sure our default configuration is present regardless of whether we use it or not */
         prepareTask = project.task("prepare${prepareNameForSuffix(name)}", type: JRubyPrepare)
         dependsOn prepareTask
@@ -270,13 +267,6 @@ class JRubyJar extends Jar {
         project.dependencies.add(customConfigName, "org.jruby.mains:jruby-mains:${getJrubyMainsVersion()}")
     }
 
-    /** Add the necessary JRuby dependencies to the specified {@code org.gradle.api.artifacts.Configuration} */
-    void addEmbeddedDependencies(Configuration config) {
-        /* To ensure that we can load our jars properly, we should always have
-         * jar-dependencies in our resolution graph */
-        project.dependencies.add(config.name, 'rubygems:jar-dependencies:[0.1.15,)')
-    }
-
     /** Update the staging directory and tasks responsible for setting it up */
     void updateStageDirectory() {
         File dir = project.file("${project.buildDir}/dirinfo/${configuration}")

jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJar.groovy

@@ -22,38 +22,6 @@ class JRubyJarPlugin implements Plugin<Project> {
         project.tasks.create('jrubyJar', JRubyJar)
 
         updateTestTask(project)
-
-        project.afterEvaluate {
-            checkJRubyVersions(project)
-        }
-    }
-
-    /**
-     * Check our configured jruby versions to see if any of them are old enough
-     * to cause problems with a packed jar
-     * <https://github.com/jruby-gradle/jruby-gradle-plugin/issues/191>
-     */
-    void checkJRubyVersions(Project project) {
-        project.tasks.each { Task task ->
-            if ((task instanceof JRubyJar) && (task.scriptName != JRubyJar.Type.LIBRARY)) {
-                if (isJRubyVersionDeprecated(task.jrubyVersion)) {
-                    project.logger.warn('The task `{}` is using JRuby {} which may cause unexpected behavior, see <http://jruby-gradle.org/errors/jar-deprecated-jrubyversion> for more',
-                            task.name, task.jrubyVersion)
-                }
-            }
-        }
-    }
-
-    /**
-     * Determine whether the version of the JRuby provided is deprecated as far
-     * as the jar plugin is concerned. Deprecated means that the version is unlikely
-     * to produce a useful artifact due to missing functionality in JRuby core
-     *
-     * @param version
-     * @return True if we consider this version deprecated/problematic for the jar plugin
-     */
-    boolean isJRubyVersionDeprecated(String version) {
-        return (version.matches(/1.7.1(\d+)/)) as boolean
     }
 
     @PackageScope