Repository: tapestry-5 Updated Branches: refs/heads/master 7faf5f943 -> d6d1bf134
fix deprecation warning Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d7ef1411 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d7ef1411 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d7ef1411 Branch: refs/heads/master Commit: d7ef1411797e001df9cdf00ac56ba9391120545a Parents: 7faf5f9 Author: Jochen Kemnade <jochen.kemn...@eddyson.de> Authored: Fri Mar 3 06:47:03 2017 +0100 Committer: Jochen Kemnade <jochen.kemn...@eddyson.de> Committed: Fri Mar 3 06:47:03 2017 +0100 ---------------------------------------------------------------------- build.gradle | 86 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d7ef1411/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index da137fd..ab5abd5 100755 --- a/build.gradle +++ b/build.gradle @@ -577,47 +577,49 @@ boolean isWindows() { System.properties['os.name'].toLowerCase().contains('windows') } -task updateBootstrap << { - def bootstrapVersion = '3.3.7' - def target = new File(temporaryDir, 'bootstrap.zip') - ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip", dest: target) - - def adjustDirectory = { - def relativePath = it.relativePath - if (relativePath.pathString.contains('/dist/')){ - relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[2..-1] as String[]) - } else { - relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[1..-1] as String[]) - } - println "copying $it.relativePath to $relativePath" - it.relativePath = relativePath - - } - - copy { - from(zipTree(target)){ - include('*/js/*.js') - include('*/dist/fonts/*') - eachFile adjustDirectory - } - from(zipTree(target)){ - include('*/dist/css/bootstrap.css') - include('*/dist/css/bootstrap-theme.css') - eachFile adjustDirectory - // TAP5-2351: remove source map reference from css files - filter({ (it ==~ /\/\*\s*# sourceMappingURL=[\S]+\s*\*\//) ? "" : it }) - } - into('tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/') - } - - copy { - from(zipTree(target)){ - include('*/js/*.js') - include('*/dist/fonts/*') - include('*/less/**/*.less') - - eachFile adjustDirectory - } - into('tapestry-webresources/src/test/webapp/bootstrap/') +task updateBootstrap { + doLast { + def bootstrapVersion = '3.3.7' + def target = new File(temporaryDir, 'bootstrap.zip') + ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip", dest: target) + + def adjustDirectory = { + def relativePath = it.relativePath + if (relativePath.pathString.contains('/dist/')){ + relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[2..-1] as String[]) + } else { + relativePath = new RelativePath(!it.file.isDirectory(), relativePath.segments[1..-1] as String[]) + } + println "copying $it.relativePath to $relativePath" + it.relativePath = relativePath + + } + + copy { + from(zipTree(target)){ + include('*/js/*.js') + include('*/dist/fonts/*') + eachFile adjustDirectory + } + from(zipTree(target)){ + include('*/dist/css/bootstrap.css') + include('*/dist/css/bootstrap-theme.css') + eachFile adjustDirectory + // TAP5-2351: remove source map reference from css files + filter({ (it ==~ /\/\*\s*# sourceMappingURL=[\S]+\s*\*\//) ? "" : it }) + } + into('tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/') + } + + copy { + from(zipTree(target)){ + include('*/js/*.js') + include('*/dist/fonts/*') + include('*/less/**/*.less') + + eachFile adjustDirectory + } + into('tapestry-webresources/src/test/webapp/bootstrap/') + } } }