This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle-debian-helper.
commit b3ae5dac13046563192de8d707471a347db10c67 Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 15 00:36:06 2015 +0200 Resolve the dependencies in the buildSrc files --- gradle-helper-plugin/src/main/perl/gradle.pm | 10 ++++++++-- test-project/buildSrc/build.gradle | 5 +++++ test-project/init.gradle | 2 +- test-project/test.bat | 4 +++- test-project/test.sh | 18 ++++++++++-------- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/gradle-helper-plugin/src/main/perl/gradle.pm b/gradle-helper-plugin/src/main/perl/gradle.pm index d3dc555..a5081cd 100644 --- a/gradle-helper-plugin/src/main/perl/gradle.pm +++ b/gradle-helper-plugin/src/main/perl/gradle.pm @@ -30,7 +30,13 @@ sub new { "--no-daemon", "--refresh-dependencies", "--gradle-user-home", ".gradle", - "--init-script", "/usr/share/gradle-debian-helper/init.gradle"); + # "--init-script", "/usr/share/gradle-debian-helper/init.gradle", + ); + + # Copy the init script under .gradle/init.d to work around a bug with the --init-script parameter (GRADLE-3197) + $this->doit_in_builddir("mkdir", "-p", ".gradle/init.d"); + $this->doit_in_builddir("cp", "/usr/share/gradle-debian-helper/init.gradle", ".gradle/init.d/"); + return $this; } @@ -40,7 +46,7 @@ sub build { if (!@_) { push(@_, "jar"); } - + $this->doit_in_builddir(@{$this->{gradle_cmd}}, @_); } diff --git a/test-project/buildSrc/build.gradle b/test-project/buildSrc/build.gradle new file mode 100644 index 0000000..f5ddbbc --- /dev/null +++ b/test-project/buildSrc/build.gradle @@ -0,0 +1,5 @@ +apply plugin: 'java' + +dependencies { + compile group: 'commons-net', name: 'commons-net', version: '3.0' +} diff --git a/test-project/init.gradle b/test-project/init.gradle index 8767d36..e829e33 100644 --- a/test-project/init.gradle +++ b/test-project/init.gradle @@ -1,7 +1,7 @@ initscript { def home = System.properties['user.home'] dependencies { - classpath fileTree(dir: '../gradle-helper-plugin/target/', include: '*.jar') + classpath fileTree(dir: '../../../gradle-helper-plugin/target/', include: '*.jar') classpath fileTree(dir: home + '/.m2/repository/org/debian/maven/maven-repo-helper/1.8.10/', include: '*.jar') } } diff --git a/test-project/test.bat b/test-project/test.bat index a300b08..0efceb7 100644 --- a/test-project/test.bat +++ b/test-project/test.bat @@ -1 +1,3 @@ -gradle --info --refresh-dependencies --offline --gradle-user-home .gradle --console plain --init-script init.gradle compileJava +mkdir .gradle\init.d +copy init.gradle .gradle\init.d\ +gradle --info --refresh-dependencies --offline --gradle-user-home .gradle --console plain compileJava diff --git a/test-project/test.sh b/test-project/test.sh index 0e42c4a..c226c61 100644 --- a/test-project/test.sh +++ b/test-project/test.sh @@ -1,8 +1,10 @@ -#!/bin/bash - -rm -Rf .gradle -gradle --info --refresh-dependencies --offline \ - --gradle-user-home .gradle \ - --console plain \ - --init-script init.gradle \ - compileJava +#!/bin/bash + +rm -Rf .gradle +mkdir -p .gradle/init.d +cp init.gradle .gradle/init.d/ + +gradle --info --refresh-dependencies --offline \ + --gradle-user-home .gradle \ + --console plain \ + compileJava -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
