Don't compile ScalaTests on Java 7

2017-12-09 12:42:52 +00:00
parent 578656021e
commit 46a342180d
2 changed files with 14 additions and 8 deletions
--- a/apps/routerconsole/build.gradle
+++ b/apps/routerconsole/build.gradle
@@ -7,11 +7,6 @@ sourceSets {
            srcDir 'java/src'
        }
    }
-    test {
-        scala {
-            srcDir 'java/test/scalatest'
-        }
-    }
 }

 dependencies {
@@ -28,6 +23,13 @@ dependencies {
 }

 if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
+    sourceSets {
+        test {
+            scala {
+                srcDir 'java/test/scalatest'
+            }
+        }
+    }
    task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
        main = 'org.scalatest.tools.Runner'
        args = ['-R', 'build/classes/scala/test', '-o']