This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit 2dcf2ba3fdcf6a35753b50899ef1937f6b772a6b Author: Kai-Chung Yan <[email protected]> Date: Tue Jun 16 22:11:08 2015 +0800 Removing guava version in buildSrc produces errors --- debian/patches/34_disable_code_quality.diff | 2 +- debian/patches/disable_buildSrc_tests.diff | 2 +- debian/patches/use_local_artifacts.diff | 15 ++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff index 285673b..ed1c88f 100644 --- a/debian/patches/34_disable_code_quality.diff +++ b/debian/patches/34_disable_code_quality.diff @@ -19,7 +19,7 @@ Forwarded: not-needed apply plugin: 'idea' apply plugin: 'eclipse' -@@ -41,5 +41,5 @@ +@@ -42,5 +42,5 @@ compile "org.gradle.jarjar:jarjar:1.2.1" } apply from: '../gradle/compile.gradle' diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff index c2bdabc..5cfc2c6 100644 --- a/debian/patches/disable_buildSrc_tests.diff +++ b/debian/patches/disable_buildSrc_tests.diff @@ -4,7 +4,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-06-03 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -43,3 +43,15 @@ +@@ -44,3 +44,15 @@ apply from: '../gradle/compile.gradle' //apply from: '../gradle/codeQuality.gradle' apply from: '../gradle/classycle.gradle' diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 4b2db32..1dd8335 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -1,13 +1,9 @@ Description: Use local jar files to build Gradle. The core point is using "flatDir" as the only artifacts repository and make all dependencies versionless by removing the version number of some - of the dependency declarations. Typically packaging Java - projects built with Gradle does not need to remove the version - of dependencies, but Gradle itself is a special case because - it dynamically loads Java libraries using the jar filename, - ignoring /usr/share/java/. + of the dependency declarations. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-06-14 +Last-Update: 2015-06-16 --- a/build.gradle +++ b/build.gradle @@ -115,7 +115,7 @@ @@ -45,19 +41,20 @@ Last-Update: 2015-06-14 userGuideStyleSheets --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -21,13 +21,12 @@ +@@ -21,13 +21,13 @@ apply plugin: 'eclipse' repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } - mavenCentral() -+ flatDir { dirs "/usr/share/java" } ++ maven { url "/usr/share/maven-repo/" } ++ flatDir { dirs "/usr/share/java/" } } dependencies { compile gradleApi() - compile 'com.google.guava:guava-jdk5:14.0.1@jar' -+ compile 'com.google.guava:guava@jar' ++ compile 'com.google.guava:guava:[14.0.1, )@jar' compile 'commons-lang:commons-lang:2.6@jar' compile localGroovy() testCompile 'junit:junit:4.11@jar' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
