Changeset def9392

Timestamp:

Feb 17, 2019 9:30:53 AM (2 years ago)

Author:

str4d <str4d@…>

Branches:

master

Children:

ad5301a

Parents:

f9c1396

Message:

Gradle: Disable ScalaTests? when TARGET_JAVA_HOME is set

Previously, ScalaTests? were only disabled when running Gradle with JDK 7.
Gradle 5+ only runs on JDK 8+, so when cross-compiling and testing JDK 7
we need to check for this state and disable ScalaTests?.

Files:

• apps/routerconsole/build.gradle (modified) (1 diff)
• core/build.gradle (modified) (1 diff)

apps/routerconsole/build.gradle

@@ -25 +25 @@
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
+if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVersion.VERSION_1_7) {
     sourceSets {
         test {

core/build.gradle

@@ -46 +46 @@
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
+if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVersion.VERSION_1_7) {
     sourceSets {
         test {