2.2.0: use of gradle 1.6 (+ minor bug fix)

RELEASE.md

@@ -1,3 +1,8 @@
+2.2.0 (2013/05/10)
+------------------
+* use of `gradle 1.6`
+* fixed small issue when build dir unavailable
+
 2.1.0 (2013/04/26)
 ------------------
 * Implemented [#1](https://github.com/pongasoft/gradle-plugins/issues/1): _Allow for "orphan" publishing_

build.gradle

@@ -49,5 +49,5 @@ subprojects { p ->
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '1.5'
+  gradleVersion = '1.6'
 }

buildSrc/src/main/groovy/org/linkedin/gradle/core/BuildInfo.groovy

@@ -80,7 +80,9 @@ public class BuildInfo
       rootProject.logger.info(toInternalJson())
       if(!result.failure)
       {
-        computeBuildInfoFile(rootProject).text = toInternalJson()
+        def file = computeBuildInfoFile(rootProject)
+        file.parentFile.mkdirs()
+        file.text = toInternalJson()
       }
     }
   }

buildSrc/src/main/groovy/org/linkedin/gradle/plugins/ReleasePlugin.groovy

@@ -142,15 +142,12 @@ class ReleasePlugin implements Plugin<Project>
       }
 
       // we make sure that if both release and publish are provided, release happens first!
-      if(project.gradle.startParameter.taskNames.containsAll(['release', 'publish']))
-      {
-        project.logger.debug("detected release and publish in same build => publish depends on release")
-        project.uploadPublishMaster.dependsOn 'release'
-      }
-      else
+      project.uploadPublishMaster.mustRunAfter 'release'
+
+      // if publish is 'detached' then we make sure that the previous build actually did
+      // build the artifacts!
+      if(!project.gradle.startParameter.taskNames.containsAll(['release', 'publish']))
       {
-        // if publish is 'detached' then we make sure that the previous build actually did
-        // build the artifacts!
         if(!publishMasterConfiguration.getExtendsFrom().contains(releaseMasterConfiguration))
         {
           project.logger.debug("${publishMasterConfiguration.name} is orphan => populating from previous build")
@@ -344,7 +341,7 @@ class ReleasePlugin implements Plugin<Project>
   {
     Configuration configuration = project.configurations.findByName(configurationName)
     if(!configuration)
-      configuration = project.configurations.add(configurationName)
+      configuration = project.configurations.create(configurationName)
     return configuration
   }
 

buildSrc/src/main/groovy/org/linkedin/gradle/plugins/SpecPlugin.groovy

@@ -15,14 +15,11 @@
  * the License.
  */
 
-
-
 package org.linkedin.gradle.plugins
 
 import org.gradle.api.Project
 import org.gradle.api.Plugin
 import org.apache.tools.ant.filters.ReplaceTokens
-import org.gradle.util.DeleteOnExit
 import org.linkedin.gradle.utils.JsonUtils
 import org.linkedin.gradle.utils.Utils
 
@@ -83,16 +80,22 @@ class SpecPlugin implements Plugin<Project>
     def tmpFolder = File.createTempFile("project-spec", "")
     tmpFolder.delete()
     tmpFolder.mkdirs()
-    DeleteOnExit.addFile(tmpFolder)
 
-    project.copy {
-      from(jsonProjectSpec) {
-        filter(ReplaceTokens, tokens: tokens)
+    try
+    {
+      project.copy {
+        from(jsonProjectSpec) {
+          filter(ReplaceTokens, tokens: tokens)
+        }
+        into tmpFolder
       }
-      into tmpFolder
-    }
 
-    return parseProjectSpec(new File(tmpFolder, 'project-spec.json'), false)
+      return parseProjectSpec(new File(tmpFolder, 'project-spec.json'), false)
+    }
+    finally
+    {
+      project.delete(tmpFolder)
+    }
   }
 
   protected void parseProjectSpec()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 19 05:51:18 HST 2013
+#Fri May 10 14:13:31 HST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

project-spec.groovy

@@ -17,7 +17,7 @@
 spec = [
   name: 'gradle-plugins',
   group: 'org.pongasoft',
-  version: '2.1.0',
+  version: '2.2.0',
 
   versions: [
     jdk: '1.7'