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 c7bd637efc8d357d5f91a001eff75e8e8069582f Author: Damien Raude-Morvan <[email protected]> Date: Sat Jan 5 01:03:36 2013 +0100 Disable Zinc compile. --- debian/patches/33_scala_zinc.diff | 50 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 51 insertions(+) diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff new file mode 100644 index 0000000..0637707 --- /dev/null +++ b/debian/patches/33_scala_zinc.diff @@ -0,0 +1,50 @@ +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 <[email protected]> +Last-Update: 2013-01-05 +Forwarded: not-needed +--- a/subprojects/scala/scala.gradle ++++ b/subprojects/scala/scala.gradle +@@ -23,11 +23,14 @@ + compile project(":plugins") + + // keep in sync with ScalaBasePlugin code +- provided("com.typesafe.zinc:zinc:0.2.0") ++ // provided("com.typesafe.zinc:zinc:0.2.0") + + testCompile libraries.slf4j_api + } + ++// No Zinc compiler ++sourceSets.main.groovy.excludes = ['**/org/gradle/api/internal/tasks/scala/jdk6/**'] ++ + useTestFixtures(project: ":plugins") // includes core test fixtures + + if (!javaVersion.java6Compatible) { +--- 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 +@@ -101,11 +101,11 @@ + compile.scalaClasspath = project.configurations[SCALA_TOOLS_CONFIGURATION_NAME] + compile.conventionMapping.zincClasspath = { + def config = project.configurations[ZINC_CONFIGURATION_NAME] +- if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { +- project.dependencies { +- zinc("com.typesafe.zinc:zinc:0.2.0") +- } +- } ++ //if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { ++ //project.dependencies { ++ // zinc("com.typesafe.zinc:zinc:0.2.0") ++ //} ++ //} + config + } + } +@@ -118,4 +118,4 @@ + scalaDoc.scalaClasspath = project.configurations[SCALA_TOOLS_CONFIGURATION_NAME] + } + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index 662d359..38bfbd4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ 30_envjs.diff 31_hamcrest_12.diff 32_disable_it.diff +33_scala_zinc.diff -- 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
