Merge pull request #309 from ysb33r/gradle42

Upgradle to 4.2 and use GradleTest 1.0-beta12

Author: ysb33r

.gitignore

@@ -5,3 +5,4 @@ build/
 *.iml
 .idea
 .awestruct/
+out/

.travis.yml

@@ -5,20 +5,17 @@ addons:
     packages:
       - oracle-java8-installer
 
-install:
- - ./gradlew clean
+install: true
 
 script:
- - ./gradlew -S -i check gradleTest assemble
+ - ./gradlew -S -i --console=plain --no-daemon clean build
 
 jdk:
  - oraclejdk8
 
 os:
  - linux
 
-env: TERM=dumb
-
 cache:
   directories:
     - $HOME/.gradle

build.gradle

@@ -8,14 +8,15 @@ buildscript {
     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:0.5.4'
+        classpath 'org.ysb33r.gradle:gradletest:1.0-beta12'
         classpath "org.ajoberstar:gradle-git:1.2.0"
     }
 }
+
 apply plugin: 'idea'
 
 group = 'com.github.jruby-gradle'
-version = '1.5.1'
+version = '1.6.0-SNAPSHOT'
 defaultTasks 'check', 'assemble'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
@@ -25,60 +26,60 @@ if (!releaseBuild) {
 }
 
 subprojects {
-    apply plugin: 'groovy'
-    apply plugin: 'codenarc'
+
     apply plugin: 'idea'
     apply plugin: 'maven'
-    apply plugin: 'com.jfrog.bintray'
-    apply plugin: 'org.ysb33r.gradletest'
-    apply plugin: 'provided-base'
 
     repositories {
         jcenter()
+        maven { url rubygemsProxy }
+        maven { url torqueboxProxy }
     }
 
-    dependencies {
-        compile new GradleDist(project, '2.0').asFileTree
+    if(project.name != 'docs') {
+        apply plugin: 'groovy'
+        apply plugin: 'codenarc'
+        apply plugin: 'com.jfrog.bintray'
+        apply plugin: 'org.ysb33r.gradletest'
+        apply plugin: 'provided-base'
 
-        codenarc(
-            "org.codenarc:CodeNarc:0.24",
-            "org.codehaus.groovy:groovy-all:2.4.0+"
-        )
-    }
+        dependencies {
 
-    codenarc {
-        sourceSets = [sourceSets.main]
-        configFile = file("${rootProject.projectDir}/gradle/codenarc.rules")
-    }
+            compile localGroovy()
+            compile gradleApi()
+            compile 'org.ysb33r.gradle:grolifant:0.3'
 
-    test {
-        testLogging {
-            showStandardStreams = true
-            exceptionFormat "full"
+            codenarc(
+                "org.codenarc:CodeNarc:0.24",
+                "org.codehaus.groovy:groovy-all:2.4.0+"
+            )
         }
-    }
 
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
-    plugins.withType(JavaPlugin) {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        codenarc {
+            sourceSets = [sourceSets.main]
+            configFile = file("${rootProject.projectDir}/gradle/codenarc.rules")
+        }
 
+        test {
+            testLogging {
+                showStandardStreams = true
+                exceptionFormat "full"
+            }
+        }
 
-        project.tasks.withType(JavaCompile) { task ->
-            task.sourceCompatibility = project.sourceCompatibility
-            task.targetCompatibility = project.targetCompatibility
+        task sourcesJar(type: Jar, dependsOn: classes) {
+            classifier = 'sources'
+            from sourceSets.main.allSource
         }
 
-        project.tasks.withType(GroovyCompile) { task ->
-            task.sourceCompatibility = project.sourceCompatibility
-            task.targetCompatibility = project.targetCompatibility
+        gradleTest {
+            versions '2.8', '2.14.1', '3.0', '3.5', '4.1'
+            dependsOn jar
         }
+
+        install.dependsOn check
     }
-    install.dependsOn check
+
 
     idea {
         module {

buildSrc/.gitignore

@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath 'org.ysb33r.gradle:gradletest:0.5.3'
         classpath "org.ajoberstar:gradle-git:1.2.0"
 
         /* wow. so recursion */
@@ -20,18 +19,6 @@ apply plugin: 'com.github.jruby-gradle.base'
 
 import com.github.jrubygradle.JRubyExec
 
-
-/* We don't have a gradleTest to run in this sub-project, but I'd like to keep
- * the application of gradletest to all other subprojects in this build, so
- * we'll just remove it from ourselves
- */
-tasks.removeAll(tasks.findByName('gradleTest'))
-
-
-repositories {
-    maven { url rubygemsProxy }
-}
-
 configurations {
     asciidoctor
 }
@@ -68,7 +55,7 @@ task compileAsciidoc(type: JRubyExec) {
     /* without the --force option, awestruct is not smart enough to regenerate
      * files based on includes */
     configuration 'asciidoctor'
-    inputs.source fileTree(projectDir).include('**/*.adoc')
+    inputs.files fileTree(projectDir).include('**/*.adoc')
 }
 
 task assembleDocs {

buildSrc/src/main/groovy/GradleDist.groovy

@@ -10,6 +10,8 @@ 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.
+
 *Plugins available:*
 
 * link:base/[Base]

docs/build.gradle

@@ -3,16 +3,7 @@
  * documentation example. If you change this file, please be sure that it
  * renders appropriately in the generated documentation
  */
-buildscript {
-    repositories { jcenter() }
 
-    dependencies {
-        /* Replace "%%VERSION%%" with the version of JRuby/Gradle you wish to
-         * use if you want to use this build.gradle outside of gradleTest
-         */
-        classpath 'com.github.jruby-gradle:jruby-gradle-plugin:%%VERSION%%'
-    }
-}
 apply plugin: "com.github.jruby-gradle.base"
 
 import com.github.jrubygradle.JRubyExec

docs/index.adoc

@@ -3,16 +3,6 @@
  * documentation example. If you change this file, please be sure that it
  * renders appropriately in the generated documentation
  */
-buildscript {
-    repositories { jcenter() }
-
-    dependencies {
-        /* Replace "%%VERSION%%" with the version of JRuby/Gradle you wish to
-         * use if you want to use this build.gradle outside of gradleTest
-         */
-        classpath 'com.github.jruby-gradle:jruby-gradle-plugin:%%VERSION%%'
-    }
-}
 apply plugin: "com.github.jruby-gradle.base"
 
 import com.github.jrubygradle.JRubyExec

examples/run-ruby-binscript/build.gradle

@@ -11,12 +11,6 @@ buildscript {
          * GradleTest, this is NOT needed by end-users
          */
         classpath 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
-
-        /* Replace "%%VERSION%%" with the version of JRuby/Gradle you wish to
-         * use if you want to use this build.gradle outside of gradleTest
-         */
-        classpath 'com.github.jruby-gradle:jruby-gradle-plugin:%%VERSION%%'
-        classpath 'com.github.jruby-gradle:jruby-gradle-jar-plugin:%%VERSION%%'
     }
 }