Skip to content

Commit 6dc7674

Browse files
committed
Improved gradle-based build
- Incorporate suggestions by @cbeams. - Increase version for Spring to 3.2.RC2.
1 parent 5c26baf commit 6dc7674

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

build.gradle

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,41 @@ apply plugin: 'java'
22
apply plugin: 'scala'
33
apply plugin: 'idea'
44
apply plugin: 'eclipse'
5-
apply from: "${rootProject.projectDir}/publish-maven.gradle"
5+
apply from: "publish-maven.gradle"
66

77
group 'org.springframework.scala'
88

99
ext {
10-
springVersion = '3.2.0.RC1'
10+
springVersion = '3.2.0.RC2'
1111
scalaVersion = '2.9.2'
1212
}
1313

1414
repositories {
15-
mavenCentral()
16-
maven { url "http://repo.springsource.org/repo" }
15+
maven { url "http://repo.springsource.org/libs-snapshot" }
1716
}
1817

1918
dependencies {
2019
// Spring
21-
compile "org.springframework:spring-core:$springVersion"
22-
compile "org.springframework:spring-beans:$springVersion"
23-
compile "org.springframework:spring-context:$springVersion"
20+
compile("org.springframework:spring-core:$springVersion")
21+
compile("org.springframework:spring-beans:$springVersion")
22+
compile("org.springframework:spring-context:$springVersion")
2423
compile("org.springframework:spring-jdbc:$springVersion", optional)
2524
compile("org.springframework:spring-jms:$springVersion", optional)
2625
compile("org.springframework:spring-web:$springVersion", optional)
2726

2827
// Scala
29-
scalaTools "org.scala-lang:scala-compiler:$scalaVersion"
30-
compile "org.scala-lang:scala-library:$scalaVersion"
28+
scalaTools("org.scala-lang:scala-compiler:$scalaVersion")
29+
compile("org.scala-lang:scala-library:$scalaVersion")
3130

32-
// JEE
31+
// Java EE
3332
compile("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1", provided)
3433
compile("javax.servlet:servlet-api:2.5", provided)
3534

3635
// Test
37-
testCompile "org.scalatest:scalatest_$scalaVersion:1.6.1"
38-
testCompile "junit:junit:4.10"
39-
testRuntime "org.hsqldb:hsqldb-j5:2.2.4"
40-
testRuntime "log4j:log4j:1.2.16"
36+
testCompile("org.scalatest:scalatest_$scalaVersion:1.6.1")
37+
testCompile("junit:junit:4.10")
38+
testRuntime("org.hsqldb:hsqldb-j5:2.2.4")
39+
testRuntime("log4j:log4j:1.2.16")
4140
}
4241

4342
tasks.withType(ScalaCompile) {
@@ -46,5 +45,5 @@ tasks.withType(ScalaCompile) {
4645

4746
task wrapper(type: Wrapper) {
4847
description = 'Generates gradlew[.bat] scripts'
49-
gradleVersion = '1.2'
48+
gradleVersion = '1.3'
5049
}

0 commit comments

Comments
 (0)