[gradle-1.12] 134/211: Reintroduce 33_scala_zinc.diff: Won't package Zinc for now

[Kai-Chung Yan]

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 ca3ff95137d55ca0bbc153452068d19e0baaf844
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Wed Jun 3 16:23:06 2015 +0800

    Reintroduce 33_scala_zinc.diff: Won't package Zinc for now
---
 debian/patches/33_scala_zinc.diff            | 30 ++++++++++++++++++----------
 debian/patches/disable_tests.diff            |  2 +-
 debian/patches/remove_test_dependencies.diff |  2 +-
 debian/patches/series                        |  1 +
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index 576fe40..81f9b21 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -2,30 +2,38 @@ Description: No Zinc Compiler (https://github.com/typesafehub/zinc) in Debian.
  Zinc depends on SBT compiler and SBT is not yet in Debian
  See SBT ITP : http://bugs.debian.org/639910
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2013-01-05
+Last-Update: 2015-06-03
 Forwarded: not-needed
 --- a/subprojects/scala/scala.gradle
 +++ b/subprojects/scala/scala.gradle
-@@ -23,11 +23,14 @@
+@@ -24,13 +24,22 @@
      compile project(":plugins")
  
      // keep in sync with ScalaBasePlugin code
--    provided("com.typesafe.zinc:zinc:0.2.1")
-+    // provided("com.typesafe.zinc:zinc:0.2.1")
+-    provided("com.typesafe.zinc:zinc:0.3.0")
++    //provided("com.typesafe.zinc:zinc:0.3.0")
  
      testCompile libraries.slf4j_api
+ 
+     integTestRuntime project(":ide")
  }
  
-+// No Zinc compiler
-+sourceSets.main.groovy.excludes = ['**/org/gradle/api/internal/tasks/scala/jdk6/**']
++// Disable Zinc compiler
++sourceSets {
++    main {
++        groovy {
++            exclude "/org/gradle/api/internal/tasks/scala/jdk6/ZincScalaCompiler.java"
++        }
++    }
++}
 +
  useTestFixtures(project: ":plugins") // includes core test fixtures
  
- if (!javaVersion.java6Compatible) {
+ configure([integTest, daemonIntegTest]) {
 --- a/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy
 +++ b/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy
-@@ -195,11 +195,11 @@
-             compile.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(compile.classpath) }
+@@ -151,11 +151,11 @@
+             compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) }
              compile.conventionMapping.zincClasspath = {
                  def config = project.configurations[ZINC_CONFIGURATION_NAME]
 -                if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
@@ -41,8 +49,8 @@ Forwarded: not-needed
                  config
              }
          }
-@@ -212,4 +212,4 @@
-             scalaDoc.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(scalaDoc.classpath) }
+@@ -168,4 +168,4 @@
+             scalaDoc.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(scalaDoc.classpath) }
          }
      }
 -}
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index f0c42f8..da17601 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -114,7 +114,7 @@ Last-Update: 2015-05-28
  useClassycle()
 --- a/subprojects/scala/scala.gradle
 +++ b/subprojects/scala/scala.gradle
-@@ -33,6 +33,8 @@
+@@ -42,6 +42,8 @@
  
  useTestFixtures(project: ":plugins") // includes core test fixtures
  
diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff
index 71f175b..6bdea5e 100644
--- a/debian/patches/remove_test_dependencies.diff
+++ b/debian/patches/remove_test_dependencies.diff
@@ -137,7 +137,7 @@ Last-Update: 2015-05-28
 +    //integTestRuntime project(":ide")
  }
  
- useTestFixtures(project: ":plugins") // includes core test fixtures
+ // Disable Zinc compiler
 --- a/subprojects/sonar/sonar.gradle
 +++ b/subprojects/sonar/sonar.gradle
 @@ -25,10 +25,10 @@
diff --git a/debian/patches/series b/debian/patches/series
index fb46610..48c3a57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ fix_DocGenerationException.diff
 fix_buildInit.diff
 fix_launcher.diff
 disable_docs.diff
+33_scala_zinc.diff
 disable_distributions.diff
 disable_tests.diff
 remove_test_dependencies.diff

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