Skip to content

Commit 7f904a7

Browse files
fix pluginsFromSvn and rename to pluginsFromRepo
1 parent 855dda9 commit 7f904a7

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

gradle/assemble.gradle

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,20 +273,18 @@ def mainClassesIncludeSpec(String[] args) {
273273
}
274274
}
275275

276-
task pluginsFromSvn {
277-
dir = "$buildDir/pluginsFromSvn"
278-
grailsHibernateDest = "$dir/grails-hibernate-${version}.zip"
279-
grailsTomcatDest = "$dir/grails-tomcat-${version}.zip"
280-
outputs.files grailsHibernateDest, grailsTomcatDest
276+
task pluginsFromRepo {
277+
pluginsToFetch = [hibernate: version, tomcat: version]
278+
dir = file("$buildDir/pluginsFromRepo")
279+
outputs.files { dir.listFiles().findAll { it.name.endsWith(".zip") } }
281280
doFirst {
282281
ant {
283282
mkdir(dir: dir)
284-
def versionTag = version.replaceAll(/\./, '_').toUpperCase()
285-
get(src: "http://svn.codehaus.org/grails/trunk/grails-plugins/grails-hibernate/tags/RELEASE_${versionTag}/grails-hibernate-${version}.zip",
286-
dest: grailsHibernateDest, verbose: true, usetimestamp: true)
287-
get(src: "http://svn.codehaus.org/grails/trunk/grails-plugins/grails-tomcat/tags/RELEASE_${versionTag}/grails-tomcat-${version}.zip",
288-
dest: grailsTomcatDest, verbose: true, usetimestamp: true)
289-
283+
pluginsToFetch.each { name, version ->
284+
def versionTag = version.replaceAll(/\./, '_').toUpperCase()
285+
get(src: "http://plugins.grails.org/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.zip",
286+
dest: dir, verbose: true, usetimestamp: true)
287+
}
290288
}
291289
}
292290
}
@@ -312,7 +310,7 @@ distSpec = copySpec {
312310
into "grails-$version/doc"
313311
}
314312
exclude "**/CVS/**"
315-
from(project.files(pluginsFromSvn.dir) { builtBy 'pluginsFromSvn' }) {
313+
from(project.files(pluginsFromRepo.dir) { builtBy 'pluginsFromRepo' }) {
316314
into "grails-$version/plugins"
317315
}
318316
from('bin') {

0 commit comments

Comments
 (0)