[gradle] 02/04: Refreshed the patches

Thu May 12 08:40:36 UTC 2016

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

ebourg-guest pushed a commit to branch master
in repository gradle.

commit bba471cadddb71ab26780b744919e557682969f4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 12 10:20:20 2016 +0200

    Refreshed the patches
---
 debian/changelog                            |  8 ++++++++
 debian/patches/33_scala_zinc.diff           |  6 +++---
 debian/patches/34_disable_code_quality.diff |  4 ++--
 debian/patches/disable_tests.diff           |  8 ++------
 debian/patches/docs.diff                    |  6 +++---
 debian/patches/use_local_artifacts.diff     | 11 ++++-------
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69dcbd1..539bc70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gradle (2.12-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 May 2016 09:47:13 +0200
+
 gradle (2.11-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index 73de244..f0719ee 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -24,7 +24,7 @@ Forwarded: not-needed
 +sourceSets.main.java { exclude "**/ZincScalaCompiler.java" }
 --- 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
-@@ -106,15 +106,7 @@
+@@ -107,15 +107,7 @@
      private void configureCompileDefaults() {
          project.tasks.withType(ScalaCompile.class) { ScalaCompile compile ->
              compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) }
@@ -51,8 +51,8 @@ Forwarded: not-needed
  import org.gradle.language.base.internal.compile.CompileSpec;
  import org.gradle.language.base.internal.compile.Compiler;
  import org.gradle.platform.base.internal.toolchain.ToolProvider;
-@@ -48,11 +47,7 @@
- 
+@@ -49,11 +48,7 @@
+     @Override
      @SuppressWarnings("unchecked")
      public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) {
 -        if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) {
diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff
index dfe939b..0f02e0e 100644
--- a/debian/patches/34_disable_code_quality.diff
+++ b/debian/patches/34_disable_code_quality.diff
@@ -17,8 +17,8 @@ Forwarded: not-needed
  apply plugin: 'idea'
  apply plugin: 'eclipse'
  
-@@ -43,5 +41,4 @@
- }
+@@ -41,5 +39,4 @@
+ 
  apply from: '../gradle/compile.gradle'
  apply from: '../gradle/taskOrdering.gradle'
 -apply from: '../gradle/codeQuality.gradle'
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 3083976..60288ac 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -29,7 +29,7 @@ Last-Update: 2015-09-30
  def reportsFolder = new File(buildDir, "reports")
 --- a/gradle/groovyProject.gradle
 +++ b/gradle/groovyProject.gradle
-@@ -71,19 +71,24 @@
+@@ -72,19 +72,24 @@
      def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile"
      def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime"
  
@@ -82,7 +82,7 @@ Last-Update: 2015-09-30
 \ No newline at end of file
 --- a/subprojects/tooling-api/tooling-api.gradle
 +++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -7,39 +7,6 @@
+@@ -7,35 +7,6 @@
      compile project(':wrapper')
      compile project(':baseServices')
      publishCompile libraries.slf4j_api
@@ -107,10 +107,6 @@ Last-Update: 2015-09-30
 -    dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
 -}
 -
--integTest {
--    jvmArgs "-XX:MaxPermSize=500m"
--}
--
 -forkingIntegTest {
 -    if (isCiServer) {
 -        maxParallelForks = Math.min(2, rootProject.maxParallelForks)
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 6cd46ab..33a7f41 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -33,7 +33,7 @@ Last-Update: 2015-09-30
  }
  
  task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -296,8 +287,8 @@
+@@ -300,8 +291,8 @@
      classpath = configurations.userGuideTask
  }
  
@@ -44,9 +44,9 @@ Last-Update: 2015-09-30
  
  task javadocAll(type: Javadoc) {
      ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -337,8 +328,7 @@
-     include 'org/gradle/model/**'
+@@ -342,8 +333,7 @@
      include 'org/gradle/testkit/**'
+     include 'org/gradle/testing/**'
      exclude '**/internal/**'
 -    options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
 -        "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index b50a19f..a36a6c2 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -20,7 +20,7 @@ Last-Update: 2015-07-08
  
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
-@@ -21,25 +21,25 @@
+@@ -21,22 +21,22 @@
  apply plugin: 'eclipse'
  
  repositories {
@@ -43,14 +43,11 @@ Last-Update: 2015-07-08
 +    compile "org.pegdown:pegdown:[1.1.0, )"
      compile "org.jsoup:jsoup:1.6.3"
  
-     //below dependency was deployed to the repo.gradle.org
-     //it's built from sources at: https://github.com/szczepiq/jarjar
-     //if code changes are needed in this library we need to figure out a better way of distributing them.
--    compile "org.gradle.jarjar:jarjar:1.2.1"
-+    compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
+-    compile "com.googlecode.jarjar:jarjar:1.3"
++    compile "com.googlecode.jarjar:jarjar:[1.3, )"
  }
+ 
  apply from: '../gradle/compile.gradle'
- apply from: '../gradle/taskOrdering.gradle'
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
 @@ -34,13 +34,13 @@

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

