Changeset 46a3421


Ignore:
Timestamp:
Dec 9, 2017 12:42:52 PM (2 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
cd51c9b3
Parents:
5786560
Message:

Don't compile ScalaTests? on Java 7

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/build.gradle

    r5786560 r46a3421  
    66        java {
    77            srcDir 'java/src'
    8         }
    9     }
    10     test {
    11         scala {
    12             srcDir 'java/test/scalatest'
    138        }
    149    }
     
    2924
    3025if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     26    sourceSets {
     27        test {
     28            scala {
     29                srcDir 'java/test/scalatest'
     30            }
     31        }
     32    }
    3133    task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
    3234        main = 'org.scalatest.tools.Runner'
  • core/build.gradle

    r5786560 r46a3421  
    3232            include 'net/i2p/crypto/eddsa/math/basePrecmp'
    3333        }
    34         scala {
    35             srcDir 'java/test/scalatest'
    36         }
    3734    }
    3835}
     
    4744
    4845if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
     46    sourceSets {
     47        test {
     48            scala {
     49                srcDir 'java/test/scalatest'
     50            }
     51        }
     52    }
    4953    task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
    5054        main = 'org.scalatest.tools.Runner'
Note: See TracChangeset for help on using the changeset viewer.