[android-platform-tools-base] 07/08: Require groovy for building the package to avoid build failure

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository android-platform-tools-base.

commit 5d3ec72767c909daa8e0a0d49fc508094ea24883
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jul 14 18:13:57 2016 +0200

    Require groovy for building the package to avoid build failure
    
    Cannot infer Groovy class path because no Groovy Jar was found on class path
---
 debian/patches/build.gradle.patch     | 16 ++++++++++++----
 debian/patches/project-test-lib.patch |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index e72125c..9c04493 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
  base/build-system/builder-test-api/build.gradle    |  8 +-----
  base/build-system/builder/build.gradle             | 19 +++-----------
  base/build-system/google-services/build.gradle     |  7 +----
- base/build-system/gradle-core/build.gradle         |  6 +----
+ base/build-system/gradle-core/build.gradle         |  7 ++---
  base/build-system/gradle-experimental/build.gradle |  7 +----
  base/build-system/gradle/build.gradle              |  9 +------
  base/build-system/integration-test/build.gradle    |  5 ++--
@@ -48,7 +48,7 @@ Forwarded: not-needed
  base/templates/build.gradle                        | 10 --------
  base/testutils/build.gradle                        |  5 +---
  build.gradle                                       | 30 ++--------------------
- 42 files changed, 65 insertions(+), 250 deletions(-)
+ 42 files changed, 66 insertions(+), 250 deletions(-)
 
 diff --git a/base/annotations/build.gradle b/base/annotations/build.gradle
 index dbfcea6..d448bbf 100644
@@ -251,7 +251,7 @@ index e5afe75..663364e 100644
  groovydoc {
      exclude     "**/internal/**"
 diff --git a/base/build-system/gradle-core/build.gradle b/base/build-system/gradle-core/build.gradle
-index 2505e6d..7e3a673 100644
+index 2505e6d..f9ce6ed 100644
 --- a/base/build-system/gradle-core/build.gradle
 +++ b/base/build-system/gradle-core/build.gradle
 @@ -1,6 +1,4 @@
@@ -261,7 +261,15 @@ index 2505e6d..7e3a673 100644
  
  configurations {
      provided
-@@ -36,13 +34,11 @@ tasks.compileJava.dependsOn ":setupGradleInIde"
+@@ -20,6 +18,7 @@ dependencies {
+     compile project(':base:builder')
+     compile project(':base:lint')
+     compile "net.sf.proguard:proguard-gradle:${project.ext.proguardVersion}"
++    compile "org.codehaus.groovy:groovy-all:2.3.8"
+ 
+     // Add gradleApi to classpath for compilation, but use provided configuration so that groovy is
+     // not exposed as a runtime dependency.
+@@ -36,13 +35,11 @@ tasks.compileJava.dependsOn ":setupGradleInIde"
  
  group = 'com.android.tools.build'
  archivesBaseName = 'gradle-core'
diff --git a/debian/patches/project-test-lib.patch b/debian/patches/project-test-lib.patch
index d61bd7b..ed7e007 100644
--- a/debian/patches/project-test-lib.patch
+++ b/debian/patches/project-test-lib.patch
@@ -8,10 +8,10 @@ Subject: project-test-lib
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/base/build-system/gradle-core/build.gradle b/base/build-system/gradle-core/build.gradle
-index 7e3a673..e36483b 100644
+index f9ce6ed..1fb5f80 100644
 --- a/base/build-system/gradle-core/build.gradle
 +++ b/base/build-system/gradle-core/build.gradle
-@@ -26,7 +26,7 @@ dependencies {
+@@ -27,7 +27,7 @@ dependencies {
  
      testCompile 'junit:junit:4.12'
      testCompile 'org.mockito:mockito-all:1.9.5'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git