Skip to content

Commit

Permalink
fixed Gradle build, excluded spock-example from Gradle build
Browse files Browse the repository at this point in the history
  • Loading branch information
pniederw committed Feb 26, 2010
1 parent af45bfe commit 4d73acc
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 77 deletions.
20 changes: 19 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
allprojects {
group = "org.spockframework"
version = "0.4-groovy-1.7-SNAPSHOT"
}

subprojects {
usePlugin("groovy")

sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

dependencies {
groovy("org.codehaus.groovy:groovy-all:1.7.1") {
exclude module: "jansi"
}
}

groovyArtifact = "org.codehaus.groovy:groovy-all:1.7.0"
repositories {
mavenCentral()
}
}

task wrapper(type: Wrapper) {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include 'spock-core', 'spock-specs', 'spock-example', 'spock-tapestry', 'spock-guice', 'spock-spring', 'spock-unitils'
include 'spock-core', 'spock-specs', 'spock-tapestry', 'spock-guice', 'spock-spring', 'spock-unitils'

14 changes: 1 addition & 13 deletions spock-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-core") {
repositories {
mavenCentral()
}

project(":spock-core") {
dependencies {
groovy groovyArtifact
compile "asm:asm:2.2.3"
compile "junit:junit:4.7"
compile "cglib:cglib-nodep:2.1_3"
Expand Down
2 changes: 1 addition & 1 deletion spock-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {

dependencies {
// mandatory dependencies for using Spock
groovy "org.codehaus.groovy:groovy-all:1.7.0"
groovy "org.codehaus.groovy:groovy-all:1.7.1"
testCompile "org.spockframework:spock-core:0.4-groovy-1.7-SNAPSHOT"
testCompile "junit:junit:4.7"

Expand Down
12 changes: 0 additions & 12 deletions spock-guice/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-guice") {
repositories {
mavenCentral()
}

dependencies {
groovy groovyArtifact
compile project(":spock-core")
compile "com.google.inject:guice:2.0"
// surfaces in the Guice API; groovyc complains if we don't add it
Expand Down
12 changes: 0 additions & 12 deletions spock-specs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-specs") {
repositories {
mavenCentral()
}

dependencies {
groovy groovyArtifact
compile project(":spock-core")
compile "junit:junit:4.7"
testRuntime "cglib:cglib-nodep:2.1_3"
Expand Down
12 changes: 0 additions & 12 deletions spock-spring/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-spring") {
repositories {
mavenCentral()
}

dependencies {
groovy groovyArtifact
compile project(":spock-core")
compile "org.springframework:spring-test:2.5.6.SEC01"
compile "org.springframework:spring-beans:2.5.6.SEC01"
Expand Down
9 changes: 0 additions & 9 deletions spock-tapestry/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-tapestry") {
repositories {
mavenCentral()
// need to explicitely add repository defined in tapestry-ioc POM
// (workaround for http://jira.codehaus.org/browse/GRADLE-611)
mavenRepo(urls: "http://repository.jboss.com/maven2")
}

dependencies {
groovy groovyArtifact
compile project(":spock-core")
compile "org.apache.tapestry:tapestry-ioc:5.1.0.5"
compile "org.apache.tapestry:tapestry5-annotations:5.1.0.5"
Expand Down
25 changes: 9 additions & 16 deletions spock-unitils/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
usePlugin("groovy")
sourceCompatibility = 1.5
targetCompatibility = 1.5

compileGroovy.options.fork = false
compileTestGroovy.options.fork = false

project(":spock-unitils") {
repositories {
mavenCentral()
}

dependencies {
groovy groovyArtifact
dependencies {
compile project(":spock-core")
compile "org.unitils:unitils-core:3.1"

Expand All @@ -21,9 +9,14 @@ project(":spock-unitils") {
compile "commons-collections:commons-collections:3.2"
compile "ognl:ognl:2.6.9"

testCompile "org.unitils:unitils-dbunit:3.1"
testCompile "org.unitils:unitils-database:3.1"
testRuntime "com.h2database:h2:1.2.123"
testCompile("org.unitils:unitils-dbunit:3.1") {
exclude module: "jta"
}
testCompile("org.unitils:unitils-database:3.1") {
exclude module: "jta"
}
testCompile "junit:junit:3.8.2" // unitils seems to have a dependency on this somewhere
testRuntime("com.h2database:h2:1.2.123")
testRuntime "log4j:log4j:1.2.14"
}
}

0 comments on commit 4d73acc

Please sign in to comment.