Gradle: Run ScalaTest tests in addition to the JUnit tests

apps/routerconsole/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'war'
+apply plugin: 'scala'
 
 sourceSets {
     main {
@@ -6,6 +7,11 @@ sourceSets {
             srcDir 'java/src'
         }
     }
+    test {
+        scala {
+            srcDir 'java/test/scalatest'
+        }
+    }
 }
 
 dependencies {
@@ -16,8 +22,18 @@ dependencies {
     providedCompile project(':apps:systray')
     providedCompile project(':apps:jetty')
     providedCompile project(':apps:jrobin')
+
+    testCompile "org.scala-lang:scala-library:2.12.4"
+    testCompile 'org.scalatest:scalatest_2.12:3.0.4'
 }
 
+task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
+    main = 'org.scalatest.tools.Runner'
+    args = ['-R', 'build/classes/scala/test', '-o']
+    classpath = sourceSets.test.runtimeClasspath
+}
+test.dependsOn scalaTest
+
 jar {
     manifest {
         // Top level installer will rename to jrobin.jar

build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'idea'
+
 // Exclude apps/ dir itself, but include its subdirs
 def javaProjects = subprojects - project(':apps')
 

core/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'java-library'
+apply plugin: 'scala'
 
 archivesBaseName = 'i2p'
 
@@ -30,14 +31,27 @@ sourceSets {
             include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
             include 'net/i2p/crypto/eddsa/math/basePrecmp'
         }
+        scala {
+            srcDir 'java/test/scalatest'
+        }
     }
 }
 
 dependencies {
     implementation 'gnu.getopt:java-getopt:1.0.13'
     implementation 'org.gnu.gettext:libintl:0.18.3'
+
+    testCompile "org.scala-lang:scala-library:2.12.4"
+    testCompile 'org.scalatest:scalatest_2.12:3.0.4'
 }
 
+task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
+    main = 'org.scalatest.tools.Runner'
+    args = ['-R', 'build/classes/scala/test', '-o']
+    classpath = sourceSets.test.runtimeClasspath
+}
+test.dependsOn scalaTest
+
 configurations {
     tests
 }