Clean up build.gradle after restructured unit- and integration tests

Author: ysb33r

base-plugin/build.gradle

@@ -85,22 +85,18 @@ dependencies {
 }
 
 test {
-    systemProperties TESTROOT : new File(buildDir,'tmp/test/unittests').absolutePath
-    systemProperties TEST_GEM_DIR : new File(projectDir,'src/integTest/resources/gems').absolutePath
-    systemProperties 'logback.configurationFile' : new File(projectDir,'src/test/resources/logback-test.xml').absolutePath
-
     if (gradle.startParameter.isOffline()) {
         systemProperties 'TESTS_ARE_OFFLINE' : '1'
     }
 }
 
 generateTestConfig {
     testProperties mavenrepo: file('src/integTest/mavenrepo').absolutePath,
-        flatrepo: flatRepoDir.absolutePath,
-        bcprovVersion: bcprovVersion,
-        olderJRubyVersion: olderJRubyVersion,
-        slimVersion: slimVersion,
-        leafyVersion: leafyVersion
+            flatrepo: flatRepoDir.absolutePath,
+            bcprovVersion: bcprovVersion,
+            olderJRubyVersion: olderJRubyVersion,
+            slimVersion: slimVersion,
+            leafyVersion: leafyVersion
 }
 
 task copyIntegrationTestJRuby (type:Copy) {
@@ -109,21 +105,12 @@ task copyIntegrationTestJRuby (type:Copy) {
 }
 
 integrationTest {
-    systemProperties TESTROOT        : new File(buildDir,'tmp/integrationTest/root').absolutePath
-    systemProperties CACHEDIR        : new File(buildDir,'tmp/integrationTest/cache').absolutePath
-    systemProperties FLATREPO        : new File(buildDir,'tmp/integrationTest/flatRepo').absolutePath
-    systemProperties TEST_SCRIPT_DIR : new File(projectDir,'src/integTest/resources/scripts').absolutePath
-    systemProperties 'logback.configurationFile' : new File(projectDir,'src/integTest/resources/logback-test.xml').absolutePath
-
     if(gradle.startParameter.isOffline()) {
         systemProperties 'TESTS_ARE_OFFLINE' : '1'
     }
-
     dependsOn copyIntegrationTestJRuby
 }
 
-
-
 task installGroovyDoc (type : Copy) {
     from ({new File(buildDir,'docs/groovydoc')}) {
         include '**'

base-plugin/src/test/groovy/com/github/jrubygradle/internal/JRubyExecUtilsSpec.groovy

@@ -1,12 +1,13 @@
 package com.github.jrubygradle.internal
 
 import org.gradle.api.InvalidUserDataException
+import org.ysb33r.grolifant.api.OperatingSystem
 import spock.lang.*
 
 import static com.github.jrubygradle.internal.JRubyExecUtils.buildArgs
 
 class JRubyExecUtilsSpec extends Specification {
-    static final boolean IS_WINDOWS = System.getProperty('os.name').toLowerCase().startsWith('windows')
+    static final boolean IS_WINDOWS = OperatingSystem.current().isWindows()
 
     void "The version string in a jruby jar filename must be extracted correctly"() {