[gradle] 05/05: New patch: taskOrdering.diff

[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.

commit ba370efcc0213f59e31a6b2569290f44da02f83b
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Fri Jul 3 01:32:27 2015 +0800

    New patch: taskOrdering.diff
---
 debian/changelog                             |  2 +
 debian/patches/remove_test_dependencies.diff | 72 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/patches/taskOrdering.diff             | 15 ++++++
 4 files changed, 90 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 20bd1fb..11d12cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gradle (2.4-1) UNRELEASED; urgency=low
   * d/watch: Watch services.gradle.org
   * d/copyright: Add Files-Excluded for uscan
   * d/rules: Simplify get-orig-source target
+  * Refresh all existing patches
   * Drop multiple patches under d/patches/:
     - 03_plexus.diff
     - 11_fix_jni_path.diff
@@ -19,6 +20,7 @@ gradle (2.4-1) UNRELEASED; urgency=low
     - diagnostics_jquery.diff
     - disable_css3pie.diff
   * New d/patches/disable_aws.diff: AWS SDK for Java is not in Debian
+  * New d/patches/taskOrdering.diff: shouldRunAfter() is not in Gradle 1.5
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Sun, 28 Jun 2015 19:28:30 +0800
 
diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff
index b836065..ab3572d 100644
--- a/debian/patches/remove_test_dependencies.diff
+++ b/debian/patches/remove_test_dependencies.diff
@@ -275,3 +275,75 @@ Last-Update: 2015-07-02
  }
  
  useTestFixtures()
+--- a/subprojects/language-groovy/language-groovy.gradle
++++ b/subprojects/language-groovy/language-groovy.gradle
+@@ -3,9 +3,6 @@
+     compile project(":languageJava")
+ 
+     testCompile libraries.groovy
+-
+-    // TODO - get rid of this cycle
+-    integTestRuntime project(':plugins')
+ }
+ 
+ strictCompile()
+--- a/subprojects/language-java/language-java.gradle
++++ b/subprojects/language-java/language-java.gradle
+@@ -3,9 +3,6 @@
+     compile project(":core")
+     compile project(":platformJvm")
+     compile project(":languageJvm")
+-
+-    // TODO - get rid of this cycle
+-    integTestRuntime project(':plugins')
+ }
+ 
+ // These public packages have classes that are tangled with the corresponding internal package.
+--- a/subprojects/language-jvm/language-jvm.gradle
++++ b/subprojects/language-jvm/language-jvm.gradle
+@@ -3,10 +3,6 @@
+     compile project(":platformBase")
+ 
+     testCompile libraries.groovy
+-
+-    testRuntime project(":languageJava")
+-
+-    testFixturesCompile project(":internalIntegTesting")
+ }
+ 
+ useClassycle()
+--- a/subprojects/language-native/language-native.gradle
++++ b/subprojects/language-native/language-native.gradle
+@@ -19,8 +19,6 @@
+     compile project(':platformNative')
+ 
+     testCompile libraries.groovy
+-
+-    integTestRuntime project(":ideNative")
+ }
+ 
+ useTestFixtures()
+--- a/subprojects/launcher/launcher.gradle
++++ b/subprojects/launcher/launcher.gradle
+@@ -14,21 +14,11 @@
+ 
+     testCompile libraries.groovy
+ 
+-    integTestRuntime project(':plugins')
+-
+     startScriptGenerator project(':plugins')
+-
+-    testFixturesCompile project(':internalTesting')
+ }
+ 
+ useTestFixtures()
+ 
+-integTestTasks.all {
+-    if (isCiServer) {
+-        maxParallelForks = Math.min(3, rootProject.maxParallelForks)
+-    }
+-}
+-
+ jar {
+     manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain")
+     doFirst {
diff --git a/debian/patches/series b/debian/patches/series
index c429639..926718f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ disable_release_notes.diff
 search_system_jar.diff
 26_disable_commitid.diff
 disable_aws.diff
+taskOrdering.diff
diff --git a/debian/patches/taskOrdering.diff b/debian/patches/taskOrdering.diff
new file mode 100644
index 0000000..b7e4645
--- /dev/null
+++ b/debian/patches/taskOrdering.diff
@@ -0,0 +1,15 @@
+Description: taskOrdering.gradle uses shouldRunAfter() function which is not
+             in Gradle 1.5.
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-07-03
+--- a/gradle/taskOrdering.gradle
++++ b/gradle/taskOrdering.gradle
+@@ -30,7 +30,4 @@
+             }
+         }
+     }
+-
+-    groups.unitTest*.shouldRunAfter groups.codeQuality
+-    groups.integTest*.shouldRunAfter groups.codeQuality, groups.unitTest
+ }
+\ No newline at end of file

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