Merge pull request #222 from rtyler/104-sync

Sync recent commits into 1.0.x

.travis.yml

@@ -5,18 +5,14 @@ install:
  - ./gradlew clean
 
 script:
- - ./gradlew -S -i
- - ./gradlew -S -i gradleTest
+ - ./gradlew -S -i check gradleTest assemble
 
 jdk:
- - oraclejdk7
  - oraclejdk8
  - openjdk7
 
 os:
  - linux
-# some travis issue - currently
-# - osx
 
 env: TERM=dumb
 

jruby-gradle-base-plugin/build.gradle

@@ -141,7 +141,7 @@ gradleLocations {
 }
 
 gradleTest {
-    versions '2.0','2.2','2.4'
+    versions '2.0','2.2','2.6'
     dependsOn jar
 }
 // vim: ft=groovy

jruby-gradle-jar-plugin/gradle/integration-test.gradle

@@ -53,7 +53,7 @@ task integrationTest(type: Test) {
 check.dependsOn integrationTest
 
 gradleTest {
-    versions '2.0', '2.2', '2.4', '2.6'
+    versions '2.0', '2.2', '2.6'
     dependsOn test, integrationTest, jar
 }
 

jruby-gradle-jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyDirInfo.groovy

@@ -15,7 +15,6 @@ class JRubyDirInfo {
 
     JRubyDirInfo(File dir) {
         dirInfo = dir
-        dirInfo.deleteDir();
     }
 
     File toFile(File path, String subdir) {