From acfa74706b83d620c675df81fcb81b805f6293a8 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@gradle.com>
Date: Wed, 18 Nov 2015 12:45:16 +0000
Subject: add gradle wrapper using gradle 2.9

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 53636 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'gradle')

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index fd7e590..9411448 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6e80329..2aae013 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 03 23:57:28 CEST 2015
+#Wed Nov 18 11:44:20 WET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
-- 
cgit 


From da9a1b100639e7eb5a7986952f5a1f3ba0d675e6 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@gradle.com>
Date: Wed, 18 Nov 2015 12:48:31 +0000
Subject: Add infrastructure for adding integration tests using testkit

---
 gradle/integTest.gradle | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 gradle/integTest.gradle

(limited to 'gradle')

diff --git a/gradle/integTest.gradle b/gradle/integTest.gradle
new file mode 100644
index 0000000..07b0743
--- /dev/null
+++ b/gradle/integTest.gradle
@@ -0,0 +1,50 @@
+sourceSets {
+    integTest {
+        compileClasspath += main.output + test.output
+        runtimeClasspath += main.output + test.output
+    }
+}
+
+configurations {
+    integTestCompile.extendsFrom testCompile
+    integTestRuntime.extendsFrom testRuntime
+}
+
+task integTest(type: Test) {
+    shouldRunAfter 'test'
+    testClassesDir = sourceSets.integTest.output.classesDir
+    classpath = sourceSets.integTest.runtimeClasspath
+
+}
+check.dependsOn(integTest)
+
+plugins.withType(org.gradle.plugins.ide.idea.IdeaPlugin) {
+    idea {
+        module {
+            testSourceDirs += sourceSets.integTest.groovy.srcDirs
+            testSourceDirs += sourceSets.integTest.resources.srcDirs
+            scopes.TEST.plus.add(configurations.integTestCompile)
+            scopes.TEST.plus.add(configurations.integTestRuntime)
+        }
+    }
+}
+
+
+// START SNIPPET test-logic-classpath
+// Write the plugin's classpath to a file to share with the tests
+task createClasspathManifest {
+    def outputDir = file("$buildDir/$name")
+
+    inputs.files sourceSets.main.runtimeClasspath
+    outputs.dir outputDir
+
+    doLast {
+        outputDir.mkdirs()
+        file("$outputDir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join("\n")
+    }
+}
+
+// Add the classpath file to the test runtime classpath
+dependencies {
+    integTestRuntime files(createClasspathManifest)
+}
\ No newline at end of file
-- 
cgit