AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't run ScalaTests on Java 7

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/build.gradle
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'
} }
if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
main = 'org.scalatest.tools.Runner' main = 'org.scalatest.tools.Runner'
args = ['-R', 'build/classes/scala/test', '-o'] args = ['-R', 'build/classes/scala/test', '-o']
classpath = sourceSets.test.runtimeClasspath classpath = sourceSets.test.runtimeClasspath
} }
test.dependsOn scalaTest test.dependsOn scalaTest
}
jar { jar {
manifest { manifest {

2
core/build.gradle
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'
} }
if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
task scalaTest(dependsOn: ['testClasses'], type: JavaExec) { task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
main = 'org.scalatest.tools.Runner' main = 'org.scalatest.tools.Runner'
args = ['-R', 'build/classes/scala/test', '-o'] args = ['-R', 'build/classes/scala/test', '-o']
classpath = sourceSets.test.runtimeClasspath classpath = sourceSets.test.runtimeClasspath
} }
test.dependsOn scalaTest test.dependsOn scalaTest
}
configurations { configurations {
tests tests