Changeset def9392


Ignore:
Timestamp:
Feb 17, 2019 9:30:53 AM (22 months 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:
2 edited

Legend:

Unmodified
Added
Removed

  • apps/routerconsole/build.gradle

    rf9c1396 rdef9392  
    2525}
    2626
    27 if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     27if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVersion.VERSION_1_7) {
    2828    sourceSets {
    2929        test {

  • core/build.gradle

    rf9c1396 rdef9392  
    4646}
    4747
    48 if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     48if (System.getenv("TARGET_JAVA_HOME") == null && JavaVersion.current() != JavaVersion.VERSION_1_7) {
    4949    sourceSets {
    5050        test {
Note: See TracChangeset for help on using the changeset viewer.