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

Don't compile ScalaTests on Java 7

Browse Source
This commit is contained in:
str4d
2017-12-09 12:42:52 +00:00
parent 578656021e
commit 46a342180d
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/routerconsole/build.gradle
View File

@@ -7,11 +7,6 @@ sourceSets {
srcDir 'java/src' srcDir 'java/src'
} }
} }
test {
scala {
srcDir 'java/test/scalatest'
}
}
} }
dependencies { dependencies {
@@ -28,6 +23,13 @@ dependencies {
} }
if (JavaVersion.current() != JavaVersion.VERSION_1_7) { if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
sourceSets {
test {
scala {
srcDir 'java/test/scalatest'
}
}
}
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']

10
core/build.gradle
View File

@@ -31,9 +31,6 @@ sourceSets {
include 'net/i2p/crypto/eddsa/math/baseDblPrecmp' include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
include 'net/i2p/crypto/eddsa/math/basePrecmp' include 'net/i2p/crypto/eddsa/math/basePrecmp'
} }
scala {
srcDir 'java/test/scalatest'
}
} }
} }
@@ -46,6 +43,13 @@ dependencies {
} }
if (JavaVersion.current() != JavaVersion.VERSION_1_7) { if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
sourceSets {
test {
scala {
srcDir 'java/test/scalatest'
}
}
}
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']