[gradle] 06/08: patches 33 and 35 refreshed

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch 1.8
in repository gradle.

commit 22cc158aea23a9d31d89a47e60c00473919cb881
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Wed May 14 11:21:06 2014 +0000

    patches 33 and 35 refreshed
---
 debian/patches/33_scala_zinc.diff |  4 +++-
 debian/patches/35_ivy_23.diff     | 13 -------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index 576fe40..cd1418f 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -6,7 +6,7 @@ Last-Update: 2013-01-05
 Forwarded: not-needed
 --- a/subprojects/scala/scala.gradle
 +++ b/subprojects/scala/scala.gradle
-@@ -23,11 +23,14 @@
+@@ -24,13 +24,16 @@
      compile project(":plugins")
  
      // keep in sync with ScalaBasePlugin code
@@ -14,6 +14,8 @@ Forwarded: not-needed
 +    // provided("com.typesafe.zinc:zinc:0.2.1")
  
      testCompile libraries.slf4j_api
+
+     integTestRuntime project(":ide")
  }
  
 +// No Zinc compiler
diff --git a/debian/patches/35_ivy_23.diff b/debian/patches/35_ivy_23.diff
index 3719a0d..dd56620 100644
--- a/debian/patches/35_ivy_23.diff
+++ b/debian/patches/35_ivy_23.diff
@@ -38,17 +38,4 @@
 -}
 \ No newline at end of file
 +}
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java
-@@ -63,6 +63,11 @@
-         return null;
-     }
- 
-+    public org.apache.ivy.core.report.ArtifactDownloadReport downloadRepositoryResource(org.apache.ivy.plugins.repository.Resource resource,
-+           java.lang.String name, java.lang.String type, java.lang.String extension, org.apache.ivy.core.cache.CacheResourceOptions options, org.apache.ivy.plugins.repository.Repository repository) {
-+         return null;
-+    }
-+
-     public void originalToCachedModuleDescriptor(DependencyResolver resolver, ResolvedResource originalMetadataRef, Artifact requestedMetadataArtifact, ResolvedModuleRevision rmr, ModuleDescriptorWriter writer) {
-     }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git