Changeset 5786560


Ignore:
Timestamp:
Dec 9, 2017 2:28:01 AM (2 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
46a3421
Parents:
7dae4eb
Message:

Don't run ScalaTests? on Java 7

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/build.gradle

    r7dae4eb r5786560  
    2828}
    2929
    30 task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
    31     main = 'org.scalatest.tools.Runner'
    32     args = ['-R', 'build/classes/scala/test', '-o']
    33     classpath = sourceSets.test.runtimeClasspath
     30if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     31    task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
     32        main = 'org.scalatest.tools.Runner'
     33        args = ['-R', 'build/classes/scala/test', '-o']
     34        classpath = sourceSets.test.runtimeClasspath
     35    }
     36    test.dependsOn scalaTest
    3437}
    35 test.dependsOn scalaTest
    3638
    3739jar {
  • core/build.gradle

    r7dae4eb r5786560  
    4646}
    4747
    48 task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
    49     main = 'org.scalatest.tools.Runner'
    50     args = ['-R', 'build/classes/scala/test', '-o']
    51     classpath = sourceSets.test.runtimeClasspath
     48if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     49    task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
     50        main = 'org.scalatest.tools.Runner'
     51        args = ['-R', 'build/classes/scala/test', '-o']
     52        classpath = sourceSets.test.runtimeClasspath
     53    }
     54    test.dependsOn scalaTest
    5255}
    53 test.dependsOn scalaTest
    5456
    5557configurations {
Note: See TracChangeset for help on using the changeset viewer.