run scala as well as java tests

t-ober · t-ober · commit fc049fc36100 · 2021-09-02T16:55:09.000+02:00
diff --git a/gradle.properties b/gradle.properties
@@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx4096m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+com.github.maiflai.gradle-scalatest.mode = append
diff --git a/gradle/scripts/tests.gradle b/gradle/scripts/tests.gradle
@@ -4,6 +4,7 @@ test {
 		excludeTestsMatching '*IT'
 	}
 }
+test.dependsOn(scalatest)
 
 task allTests(type: Test) {
 	description 'executes all tests'

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ test {`
`4`	`4`	`excludeTestsMatching '*IT'`
`5`	`5`	`}`
`6`	`6`	`}`
	`7`	`+test.dependsOn(scalatest)`
`7`	`8`
`8`	`9`	`task allTests(type: Test) {`
`9`	`10`	`description 'executes all tests'`