Don't run ScalaTests on Java 7

This commit is contained in:
str4d
2017-12-09 02:28:01 +00:00
parent 7dae4eb303
commit 578656021e
2 changed files with 14 additions and 10 deletions

View File

@@ -27,12 +27,14 @@ dependencies {
testCompile 'org.scalatest:scalatest_2.12:3.0.4' testCompile 'org.scalatest:scalatest_2.12:3.0.4'
} }
task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
main = 'org.scalatest.tools.Runner' task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
args = ['-R', 'build/classes/scala/test', '-o'] main = 'org.scalatest.tools.Runner'
classpath = sourceSets.test.runtimeClasspath args = ['-R', 'build/classes/scala/test', '-o']
classpath = sourceSets.test.runtimeClasspath
}
test.dependsOn scalaTest
} }
test.dependsOn scalaTest
jar { jar {
manifest { manifest {

View File

@@ -45,12 +45,14 @@ dependencies {
testCompile 'org.scalatest:scalatest_2.12:3.0.4' testCompile 'org.scalatest:scalatest_2.12:3.0.4'
} }
task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
main = 'org.scalatest.tools.Runner' task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
args = ['-R', 'build/classes/scala/test', '-o'] main = 'org.scalatest.tools.Runner'
classpath = sourceSets.test.runtimeClasspath args = ['-R', 'build/classes/scala/test', '-o']
classpath = sourceSets.test.runtimeClasspath
}
test.dependsOn scalaTest
} }
test.dependsOn scalaTest
configurations { configurations {
tests tests