diff --git a/apps/routerconsole/build.gradle b/apps/routerconsole/build.gradle index 77ae1e0eb..4a10634b6 100644 --- a/apps/routerconsole/build.gradle +++ b/apps/routerconsole/build.gradle @@ -27,12 +27,14 @@ dependencies { testCompile 'org.scalatest:scalatest_2.12:3.0.4' } -task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { - main = 'org.scalatest.tools.Runner' - args = ['-R', 'build/classes/scala/test', '-o'] - classpath = sourceSets.test.runtimeClasspath +if (JavaVersion.current() != JavaVersion.VERSION_1_7) { + task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { + main = 'org.scalatest.tools.Runner' + args = ['-R', 'build/classes/scala/test', '-o'] + classpath = sourceSets.test.runtimeClasspath + } + test.dependsOn scalaTest } -test.dependsOn scalaTest jar { manifest { diff --git a/core/build.gradle b/core/build.gradle index 3214c9c6e..f7d9bb864 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -45,12 +45,14 @@ dependencies { testCompile 'org.scalatest:scalatest_2.12:3.0.4' } -task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { - main = 'org.scalatest.tools.Runner' - args = ['-R', 'build/classes/scala/test', '-o'] - classpath = sourceSets.test.runtimeClasspath +if (JavaVersion.current() != JavaVersion.VERSION_1_7) { + task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { + main = 'org.scalatest.tools.Runner' + args = ['-R', 'build/classes/scala/test', '-o'] + classpath = sourceSets.test.runtimeClasspath + } + test.dependsOn scalaTest } -test.dependsOn scalaTest configurations { tests