Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java into Bulletin_Board_Server_phase_1

Bulletin_Board_Server_phase_1
Arbel Deutsch Peled 2015-11-22 18:42:35 +02:00
commit 3837b0c53e
3 changed files with 35 additions and 0 deletions

View File

@ -57,6 +57,21 @@ dependencies {
/*==== You probably don't have to edit below this line =======*/ /*==== You probably don't have to edit below this line =======*/
// Setup test configuration that can appear as a dependency in
// other subprojects
configurations {
testOutput.extendsFrom (testCompile)
}
task testJar(type: Jar, dependsOn: testClasses) {
classifier = 'tests'
from sourceSets.test.output
}
artifacts {
testOutput testJar
}
// The run task added by the application plugin // The run task added by the application plugin
// is also of type JavaExec. // is also of type JavaExec.
tasks.withType(JavaExec) { tasks.withType(JavaExec) {

View File

@ -55,6 +55,9 @@ dependencies {
// Google protobufs // Google protobufs
compile 'com.google.protobuf:protobuf-java:3.+' compile 'com.google.protobuf:protobuf-java:3.+'
// Depend on test resources from meerkat-common
testCompile project(path: ':meerkat-common', configuration: 'testOutput')
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'
runtime 'org.codehaus.groovy:groovy:2.4.+' runtime 'org.codehaus.groovy:groovy:2.4.+'

View File

@ -58,6 +58,23 @@ dependencies {
/*==== You probably don't have to edit below this line =======*/ /*==== You probably don't have to edit below this line =======*/
// Setup test configuration that can appear as a dependency in
// other subprojects
configurations {
testOutput.extendsFrom (testCompile)
}
task testJar(type: Jar, dependsOn: testClasses) {
classifier = 'tests'
from sourceSets.test.output
}
artifacts {
testOutput testJar
}
// The run task added by the application plugin // The run task added by the application plugin
// is also of type JavaExec. // is also of type JavaExec.
tasks.withType(JavaExec) { tasks.withType(JavaExec) {