fixed dependencies for s4-edsl tests
diff --git a/subprojects/s4-core/s4-core.gradle b/subprojects/s4-core/s4-core.gradle
index 1bdbb6c..3aa1d03 100644
--- a/subprojects/s4-core/s4-core.gradle
+++ b/subprojects/s4-core/s4-core.gradle
@@ -15,13 +15,26 @@
*/
description = 'The S4 core platform.'
-
+
dependencies {
compile project(":s4-base")
compile project(":s4-comm")
testCompile project(path: ':s4-comm', configuration: 'tests')
}
+task testJar(type: Jar) {
+ baseName = "test-${project.archivesBaseName}"
+ from sourceSets.test.classes
+}
+
+configurations {
+ tests
+}
+
+artifacts {
+ tests testJar
+}
+
test {
forkEvery=1
}
diff --git a/subprojects/s4-edsl/s4-edsl.gradle b/subprojects/s4-edsl/s4-edsl.gradle
index 7dc2c07..208c9d4 100644
--- a/subprojects/s4-edsl/s4-edsl.gradle
+++ b/subprojects/s4-edsl/s4-edsl.gradle
@@ -1,12 +1,13 @@
// Use the Diezel Maven plugin to build the project.
// Gradle doesn't support Maven plugin as of version 1.0
// Useful article: http://forums.gradle.org/gradle/topics/how_to_download_and_evoke_a_maven_plugin
-
+
def generatedSourceDir = "${buildDir}/generated-src/java"
def diezelSrcDir = "${projectDir}/src/main/diezel";
dependencies {
compile project(":s4-core")
+ testCompile project(path: ':s4-core', configuration: 'tests')
}
@@ -19,7 +20,7 @@
buildscript {
repositories {
mavenCentral()
-
+
maven {
url "http://oss.sonatype.org/content/repositories/snapshots"
}
@@ -29,7 +30,7 @@
}
dependencies {
classpath libraries.diezel
- }
+ }
}
task generateSources << {
outputs.dir generatedSourceDir