[gradle-1.12] 158/211: No longer need launcher.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-1.12.

commit 059881083653320136ecc2e447c48514631b78a5
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Jun 9 23:14:22 2015 +0800

    No longer need launcher.diff
---
 debian/patches/disable_tests.diff | 34 +++++++++++++++++-----------------
 debian/patches/launcher.diff      | 15 ---------------
 debian/patches/series             |  1 -
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index f9061af..527a735 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -9,7 +9,7 @@ Last-Update: 2015-05-28
  apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
 -apply from: "gradle/testSetup.gradle"
 -apply from: "gradle/testGroupings.gradle"
- 
+
  allprojects {
      group = 'org.gradle'
 @@ -202,6 +200,4 @@
@@ -27,7 +27,7 @@ Last-Update: 2015-05-28
 @@ -65,13 +65,16 @@
      def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile"
      def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime"
- 
+
 +    /*
      dependencies {
          add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile"))
@@ -36,7 +36,7 @@ Last-Update: 2015-05-28
      }
 +    */
  }
- 
+
 +/*
  if (file("src/testFixtures").exists()) {
      apply from: "$rootDir/gradle/testFixtures.gradle"
@@ -44,34 +44,34 @@ Last-Update: 2015-05-28
 @@ -80,6 +83,8 @@
      apply from: "$rootDir/gradle/integTest.gradle"
  }
- 
+
 +*/
 +
  class ClasspathManifest extends DefaultTask {
- 
+
      FileCollection input = project.configurations.runtime
 --- a/subprojects/distributions/distributions.gradle
 +++ b/subprojects/distributions/distributions.gradle
 @@ -37,8 +37,6 @@
      dists
  }
- 
+
 -daemonIntegTest.enabled = false
 -
  evaluationDependsOn ":docs"
- 
+
  ext {
 --- a/subprojects/launcher/launcher.gradle
 +++ b/subprojects/launcher/launcher.gradle
 @@ -67,11 +67,4 @@
      }
  }
- 
+
 -daemonIntegTest {
 -    //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway.
 -    //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test.
 -    //excluding to avoid unnecessary re-running and stealing resources.
--    exclude "org/gradle/launcher/daemon/*"
+-    exclude "org/gradle/launcher/daemon/**/*"
 -}
 -
  useClassycle()
@@ -79,21 +79,21 @@ Last-Update: 2015-05-28
 --- a/subprojects/tooling-api/tooling-api.gradle
 +++ b/subprojects/tooling-api/tooling-api.gradle
 @@ -21,13 +21,17 @@
- 
+
  useTestFixtures()
- 
+
 +/*
  integTestTasks.all {
      dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
  }
 +*/
- 
+
 +/*
  daemonIntegTest {
      enabled = false //tooling integ tests use daemon anyway, don't rerun
  }
 +*/
- 
+
  task jarjarJar(type: JarJarJar) {
      appendix = "fat"
 --- a/subprojects/wrapper/wrapper.gradle
@@ -101,21 +101,21 @@ Last-Update: 2015-05-28
 @@ -35,9 +35,11 @@
      from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output }
  }
- 
+
 +/*
  integTestTasks.all {
      inputs.files { project(":distributions").binZip }
  }
 +*/
- 
+
  useTestFixtures()
  useClassycle()
 --- a/subprojects/scala/scala.gradle
 +++ b/subprojects/scala/scala.gradle
 @@ -39,6 +39,8 @@
- 
+
  useTestFixtures(project: ":plugins") // includes core test fixtures
- 
+
 +/*
  configure([integTest, daemonIntegTest]) {
      jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
diff --git a/debian/patches/launcher.diff b/debian/patches/launcher.diff
deleted file mode 100644
index a75dd1e..0000000
--- a/debian/patches/launcher.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: The "exclude" clause causes compilation error.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-28
---- a/subprojects/launcher/launcher.gradle
-+++ b/subprojects/launcher/launcher.gradle
-@@ -71,7 +71,7 @@
-     //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway.
-     //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test.
-     //excluding to avoid unnecessary re-running and stealing resources.
--    exclude "org/gradle/launcher/daemon/**/*"
-+    exclude "org/gradle/launcher/daemon/**"
- }
-
- useClassycle()
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index c033dcc..1444374 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ fix_DocGenerationException.diff
 38_use_jdk7_nio_file_api.diff
 39_ignore_test_processor_assertion.diff
 build_init.diff
-launcher.diff
 disable_docs.diff
 33_scala_zinc.diff
 disable_distributions.diff

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