Merge commit 'e879de7' into chrisr3-os-merge

This commit is contained in:
Chris Rankin
2018-07-17 22:47:24 +01:00
67 changed files with 2205 additions and 442 deletions

View File

@ -34,6 +34,11 @@ sourceSets {
runtimeClasspath += main.output + test.output
srcDir file('src/integration-test/kotlin')
}
java {
compileClasspath += main.output + test.output
runtimeClasspath += main.output + test.output
srcDir file('src/integration-test/java')
}
resources {
srcDir file('../../testing/test-utils/src/main/resources')
}