[gradle] 01/01: Update Zinc patche
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Fri Jul 3 11:36:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit f4a50b92772b9f30ab5e39b208adc0a1cc783c9e
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Fri Jul 3 19:35:39 2015 +0800
Update Zinc patche
---
debian/control | 4 ++-
debian/patches/33_scala_zinc.diff | 52 ++++++++++++++++++++++++-------
debian/patches/disable_distributions.diff | 33 +++++++++++---------
debian/patches/disable_tests.diff | 12 +++----
debian/patches/use_local_artifacts.diff | 50 +++++++++++++++++++----------
5 files changed, 102 insertions(+), 49 deletions(-)
diff --git a/debian/control b/debian/control
index 5a63bd4..3b06a68 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: ant,
docbook-xsl,
findbugs,
gradle (>= 1.5),
- groovy (>= 1.8.6),
+ groovy2,
groovy-doc,
ivy,
javahelper,
@@ -50,6 +50,7 @@ Build-Depends: ant,
libjs-jquery,
libkryo-java,
liblogback-java,
+ libmaven2-core-java,
libmaven2-core-java-doc,
libnative-platform-java (>= 0.10),
libnekohtml-java,
@@ -159,6 +160,7 @@ Depends: ant-optional,
libjetty-java,
libjetty-extra-java,
libjs-jquery,
+ libmaven2-core-java,
libobjenesis-java,
libplexus-containers1.5-java,
libpolyglot-maven-java,
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index ea75bac..dd22aef 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -1,9 +1,9 @@
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
+ 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>
Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-02
+Last-Update: 2015-07-03
Forwarded: not-needed
--- a/subprojects/language-scala/language-scala.gradle
+++ b/subprojects/language-scala/language-scala.gradle
@@ -16,7 +16,7 @@ Forwarded: not-needed
testCompile libraries.groovy
}
-@@ -14,4 +12,12 @@
+@@ -14,4 +12,6 @@
strictCompile()
useTestFixtures()
useTestFixtures(project: ":languageJvm", sourceSet: 'testFixtures')
@@ -24,13 +24,7 @@ Forwarded: not-needed
\ No newline at end of file
+useTestFixtures(project: ":platformBase")
+
-+sourceSets {
-+ main {
-+ groovy {
-+ exclude "org/gradle/api/internal/tasks/scala/jdk6/ZincScalaCompiler.java"
-+ }
-+ }
-+}
++sourceSets.main.java { exclude "**/ZincScalaCompiler.java" }
\ No newline at end of file
--- 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
@@ -51,3 +45,39 @@ Forwarded: not-needed
}
}
+--- a/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java
++++ b/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java
+@@ -21,7 +21,6 @@
+ import org.gradle.api.internal.tasks.scala.DaemonScalaCompiler;
+ import org.gradle.api.internal.tasks.scala.NormalizingScalaCompiler;
+ import org.gradle.api.internal.tasks.scala.ScalaJavaJointCompileSpec;
+-import org.gradle.api.internal.tasks.scala.ZincScalaCompiler;
+ import org.gradle.language.base.internal.compile.CompileSpec;
+ import org.gradle.language.base.internal.compile.Compiler;
+ import org.gradle.platform.base.internal.toolchain.ToolProvider;
+@@ -47,12 +46,7 @@
+
+ @SuppressWarnings("unchecked")
+ public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) {
+- if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) {
+- File projectDir = projectFinder.getProject(":").getProjectDir();
+- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new ZincScalaCompiler(resolvedScalaClasspath, resolvedZincClasspath);
+- return (Compiler<T>) new NormalizingScalaCompiler(new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(projectDir, scalaCompiler, compilerDaemonManager, resolvedZincClasspath));
+- }
+- throw new IllegalArgumentException(String.format("Cannot create Compiler for unsupported CompileSpec type '%s'", spec.getSimpleName()));
++ throw new org.gradle.api.GradleException("Gradle in Debian does not support Zinc compiler.");
+ }
+
+ @Override
+--- a/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
++++ b/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
+@@ -64,7 +64,7 @@
+ Set<File> zincClasspathFiles = zincClasspath.getFiles();
+
+ // currently, we leave it to ZincScalaCompiler to also compile the Java code
+- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(rootProjectDirectory, new ZincScalaCompiler(scalaClasspathFiles, zincClasspathFiles), compilerDaemonFactory, zincClasspathFiles);
+- return new NormalizingScalaCompiler(scalaCompiler);
++ Compiler<ScalaJavaJointCompileSpec> scalaCompiler = null;
++ throw new GradleException("Gradle in Debian does not support Zinc compiler.");
+ }
+ }
diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff
index 6507b1b..8a129a2 100644
--- a/debian/patches/disable_distributions.diff
+++ b/debian/patches/disable_distributions.diff
@@ -1,7 +1,7 @@
Description: Subproject :distribution is for generating tarballs for
distributing Gradle hence not needed.
Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-28
+Last-Update: 2015-07-03
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@
@@ -15,23 +15,26 @@ Last-Update: 2015-05-28
include 'core'
--- a/build.gradle
+++ b/build.gradle
-@@ -197,8 +197,9 @@
+@@ -197,21 +197,4 @@
}
}
-
+
-evaluationDependsOn ":distributions"
-+//evaluationDependsOn ":distributions"
-
-+/*
- task install(type: Install) {
- description = 'Installs the minimal distribution into directory $gradle_installPath'
- group = 'build'
-@@ -212,6 +213,6 @@
- with project(":distributions").allDistImage
- installDirPropertyName = 'gradle_installPath'
- }
-
-+*/
-
+-task install(type: Install) {
+- description = 'Installs the minimal distribution into directory $gradle_installPath'
+- group = 'build'
+- with project(":distributions").binDistImage
+- installDirPropertyName = 'gradle_installPath'
+-}
+-
+-task installAll(type: Install) {
+- description = 'Installs the full distribution into directory $gradle_installPath'
+- group = 'build'
+- with project(":distributions").allDistImage
+- installDirPropertyName = 'gradle_installPath'
+-}
+-
+-
apply from: "gradle/intTestImage.gradle"
\ No newline at end of file
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 70af3ae..e8a84ca 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -12,15 +12,15 @@ Last-Update: 2015-07-02
apply from: "gradle/taskOrdering.gradle"
apply from: "gradle/fix-GRADLE-2492.gradle"
-@@ -213,6 +211,4 @@
- with project(":distributions").allDistImage
- installDirPropertyName = 'gradle_installPath'
- }
--*/
+@@ -195,6 +193,4 @@
+ sleep mins * 60 * 1000
+ }
+ }
+-}
-
-apply from: "gradle/intTestImage.gradle"
\ No newline at end of file
-+*/
++}
\ No newline at end of file
--- a/gradle/groovyProject.gradle
+++ b/gradle/groovyProject.gradle
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 531c5ad..0b140bb 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -61,7 +61,7 @@ Last-Update: 2015-07-02
-libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
-libraries.jsch = "com.jcraft:jsch:0.1.51"
+libraries.commons_lang = 'commons-lang:commons-lang'
-+libraries.commons_collections = 'commons-collections:commons-collections'
++libraries.commons_collections = 'commons-collections:commons-collections3'
+libraries.jsch = "com.jcraft:jsch"
libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
dependency libraries.jsch
@@ -99,7 +99,8 @@ Last-Update: 2015-07-02
+ dom4j: 'dom4j:dom4j',
+ guava: 'com.google.guava:guava',
jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
- groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}",
+- groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}",
++ groovy: "org.codehaus.groovy:groovy-all-2.x:${versions.groovy}",
jaxen: 'jaxen:jaxen:1.1 at jar',
- jcip: "net.jcip:jcip-annotations:1.0 at jar",
+ jcip: "net.jcip:jcip-annotations",
@@ -120,9 +121,9 @@ Last-Update: 2015-07-02
-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
- dependency "org.apache.maven:maven-settings:3.0.4 at jar"
- dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
-+libraries.maven3 = dependencies.module("org.apache.maven:maven-core") {
-+ dependency "org.apache.maven:maven-settings"
-+ dependency "org.apache.maven:maven-settings-builder"
++libraries.maven3 = dependencies.module("org.apache.maven:maven3-core") {
++ dependency "org.apache.maven:maven3-settings"
++ dependency "org.apache.maven:maven3-settings-builder"
//plexus:
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
@@ -186,6 +187,25 @@ Last-Update: 2015-07-02
dependency libraries.bouncycastle_provider
}
+@@ -184,16 +184,4 @@
+ 'com.fasterxml.jackson.core:jackson-core:2.3.2 at jar',
+ 'com.fasterxml.jackson.core:jackson-annotations:2.3.2 at jar',
+ 'com.fasterxml.jackson.core:jackson-databind:2.3.2 at jar'
+-] + libraries.commons_httpclient + libraries.joda
+-
+-allprojects {
+- configurations.all {
+- resolutionStrategy.eachDependency { details ->
+- if (details.requested.group == 'org.ow2.asm') {
+- details.useTarget(libraries.asm)
+- } else if (details.requested.group == 'org.codehaus.groovy') {
+- details.useTarget(libraries.groovy)
+- }
+- }
+- }
+-}
++] + libraries.commons_httpclient + libraries.joda
+\ No newline at end of file
--- a/subprojects/jetty/jetty.gradle
+++ b/subprojects/jetty/jetty.gradle
@@ -31,14 +31,12 @@
@@ -204,17 +224,6 @@ Last-Update: 2015-07-02
useTestFixtures()
\ No newline at end of file
---- a/subprojects/code-quality/code-quality.gradle
-+++ b/subprojects/code-quality/code-quality.gradle
-@@ -26,7 +26,7 @@
-
- // minimal dependencies to make our code compile
- // we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
-- provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
-+ provided "corg.apache.bcel:findbugs-bcel"
- provided libraries.dom4j
- testRuntime "com.google.code.findbugs:bcel:2.0.1 at jar"
- testRuntime libraries.jaxen
--- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
@@ -64,7 +64,7 @@
@@ -354,3 +363,12 @@ Last-Update: 2015-07-02
dependencies {
compile project(":core")
compile project(":resources")
+@@ -74,7 +69,7 @@
+ //I'm removing the components.xml file from the sec-dispatcher jar.
+ //This file contains only single component so I think we can remove it.
+ task.doLast {
+- def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar"
++ def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar"
+ def plexusSecNoComps = "$plexusSec-noComps"
+ ant {
+ zip(destfile: plexusSecNoComps, update: true) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list