Merge pull request #9 from palantir/feature/gradle-2.8

Gradle 2.8 + dependency upgrades

Author: markelliot

.travis.yml

@@ -9,9 +9,9 @@ cache:
   directories:
   - "$HOME/.gradle/wrapper"
   - "$HOME/.gradle/native"
-  - "$HOME/.gradle/caches/2.6"
+  - "$HOME/.gradle/caches/2.8"
   - "$HOME/.gradle/caches/modules-2/files-2.1"
-  - "$HOME/.gradle/caches/modules-2/metadata-2.15"
+  - "$HOME/.gradle/caches/modules-2/metadata-2.16"
 env:
   global:
   - secure: VjbingJ5Iy8UHiX52yUrjcL4BD5aDvMYNb9k1w/gDWqUzYTunZ13x/aWo0enQJWdP09Chdvt5vfzBe6RY4oBxfyPkomvKO+4tnXKh0ivLlkdpIATrTZHoIZsYZDEOw4OSw7vevXf4BeU5CsFHvIALv3jR9xLxRxJryWolYnyg+Sp2FJVfkD2YmSnZkaZ787v+EF4nYaA8soxIvZBul7QMUPaOlOuF4N2GAAroJ43ImeJpDf+SUHKmBgQNbVpfzcsQf8S82X90xaV3TErU3moCshM1jCr27Awv/LmqR+2KpVi9qx8CjWJ+84MqJu5DUVH4qAXwg2O0k1M+Dn/5LSWu9YzkWcPYSADrO7AVw97zjii4QcjIfDb/Nce2B1bz4qXWTMjWQWgtyr3F1SwwCIyC2r9jKAoHGb3Tf5FISDvU7AI4n5ebegdtg3cIyRtJgp+8k/AhBYSzDcUbcv+tUEgJF21FcY+9jMLWpOdG+MUflVMWtqUtc/Ld52z5AwaELw0Z/1Oq1Gl8dDSzmTxSd/bdkY2rf47RTYYj2Mq+fQFRZ9LyEPBHxK4e4P1O0n6K2atWVlWd1oGSGHl1/tICZsNhKFgQmZe74kK7wIOHoWA8ybvdAQbCd4+Re67whG0KTjGSSx19FskbKEwj0Nul3SvntM8f5W9s78TSiPGEO49LCo=

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.jfrog.bintray' version '1.2'
     id 'com.gradle.plugin-publish' version '0.9.1'
-    id 'com.palantir.git-version' version '0.1.1'
+    id 'com.palantir.git-version' version '0.2.0'
     id 'eclipse'
     id 'groovy'
     id 'idea'
@@ -26,11 +26,11 @@ repositories {
 
 dependencies {
     compile gradleApi()
-    compile localGroovy()
-    compile 'org.eclipse.jgit:org.eclipse.jgit:4.0.2.201509141540-r'
+    compile 'org.codehaus.groovy:groovy-all:2.4.4'
+    compile 'org.eclipse.jgit:org.eclipse.jgit:4.1.0.201509280440-r'
 
     testCompile gradleTestKit()
-    testCompile('org.spockframework:spock-core:1.0-groovy-2.3') {
+    testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
         exclude module: 'groovy-all'
     }
     testCompile files(createClasspathManifest)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Jul 10 17:19:31 BST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip

src/test/groovy/com/palantir/gradle/gitversion/GitVersionPluginTests.groovy

@@ -32,36 +32,14 @@ class GitVersionPluginTests extends Specification {
     File buildFile
     File gitIgnoreFile
     File dirtyContentFile
-
-    def setup() {
-        projectDir = temporaryFolder.root
-        buildFile = temporaryFolder.newFile('build.gradle')
-        gitIgnoreFile = temporaryFolder.newFile('.gitignore')
-        dirtyContentFile = temporaryFolder.newFile('dirty')
-
-        def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt")
-        if (pluginClasspathResource == null) {
-            throw new IllegalStateException("Did not find plugin classpath resource, run `testClasses` build task.")
-        }
-
-        def pluginClasspath = pluginClasspathResource.readLines()
-            .collect { it.replace('\\', '\\\\') } // escape backslashes in Windows paths
-            .collect { "'$it'" }
-            .join(", ")
-
-        buildFile << """
-            buildscript {
-                dependencies {
-                    classpath files($pluginClasspath)
-                }
-            }
-        """.stripIndent()
-    }
+    List<File> pluginClasspath
 
     def 'exception when project root does not have a git repo' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
 
@@ -75,7 +53,9 @@ class GitVersionPluginTests extends Specification {
     def 'unspecified when no tags are present' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
         Git git = Git.init().setDirectory(projectDir).call();
@@ -90,7 +70,9 @@ class GitVersionPluginTests extends Specification {
     def 'unspecified when no annotated tags are present' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
         gitIgnoreFile << 'build'
@@ -108,7 +90,9 @@ class GitVersionPluginTests extends Specification {
     def 'unspecified and dirty when no annotated tags are present and dirty content' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
         gitIgnoreFile << 'build'
@@ -127,7 +111,9 @@ class GitVersionPluginTests extends Specification {
     def 'git describe when annotated tag is present' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
         gitIgnoreFile << 'build'
@@ -146,7 +132,9 @@ class GitVersionPluginTests extends Specification {
     def 'git describe and dirty when annotated tag is present and dirty content' () {
         given:
         buildFile << '''
-            apply plugin: 'com.palantir.git-version'
+            plugins {
+                id 'com.palantir.git-version'
+            }
             version gitVersion()
         '''.stripIndent()
         gitIgnoreFile << 'build'
@@ -164,7 +152,26 @@ class GitVersionPluginTests extends Specification {
     }
 
     private GradleRunner with(String... tasks) {
-        GradleRunner.create().withProjectDir(projectDir).withArguments(tasks)
+        GradleRunner.create()
+            .withPluginClasspath(pluginClasspath)
+            .withProjectDir(projectDir)
+            .withArguments(tasks)
+    }
+
+    def setup() {
+        projectDir = temporaryFolder.root
+        buildFile = temporaryFolder.newFile('build.gradle')
+        gitIgnoreFile = temporaryFolder.newFile('.gitignore')
+        dirtyContentFile = temporaryFolder.newFile('dirty')
+
+        def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt")
+        if (pluginClasspathResource == null) {
+            throw new IllegalStateException("Did not find plugin classpath resource, run `testClasses` build task.")
+        }
+
+        pluginClasspath = pluginClasspathResource.readLines()
+            .collect { it.replace('\\', '\\\\') } // escape backslashes in Windows paths
+            .collect { new File(it) }
     }
 
 }