Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Groovy was not appearing as a dependency in the artifacts' POMs, so i…

…t is now explicitly declared as a 'compile' dependency.
  • Loading branch information...
commit 305746be7324c0a40de4bec35fe180092a029291 1 parent 43f1b1f
@pledbrook pledbrook authored
Showing with 12 additions and 7 deletions.
  1. +12 −5 build.gradle
  2. +0 −2  grails-bootstrap/build.gradle
View
17 build.gradle
@@ -22,6 +22,16 @@ groovyVersion = "1.8.0-rc-1"
archivesBaseName = 'grails'
version = grailsVersion
+// Groovy is added as a dependency to both the 'groovy' and 'compile'
+// configurations, so place the dependency in a shared variable. The
+// 'compile' is required so that Groovy appears as a dependency in the
+// artifacts' POMs.
+if(System.getProperty('groovy.jar')) {
+ groovyDependency = files(System.getProperty('groovy.jar'))
+} else {
+ groovyDependency = "org.codehaus.groovy:groovy-all:${groovyVersion}"
+}
+
subprojects { project ->
apply plugin: 'groovy'
@@ -61,11 +71,8 @@ subprojects { project ->
}
dependencies {
// Groovy
- if(System.getProperty('groovy.jar')) {
- groovy files(System.getProperty('groovy.jar'))
- } else {
- groovy "org.codehaus.groovy:groovy-all:${groovyVersion}"
- }
+ groovy groovyDependency
+ compile groovyDependency
// Jars in lib
compile files(fileTree(dir:"$projectDir/src/libs" as File))
View
2  grails-bootstrap/build.gradle
@@ -1,8 +1,6 @@
import org.apache.tools.ant.filters.ReplaceTokens
dependencies {
- groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.8.0-beta-4'
-
compile( 'org.codehaus.gpars:gpars:0.9' ) {
exclude module:'netty'
}
Please sign in to comment.
Something went wrong with that request. Please try again.