From 6442504365cb34a461a0f76071644d203382ef4c Mon Sep 17 00:00:00 2001
From: Yan Pujante <yan@pongasoft.com>
Date: Fri, 10 May 2013 14:46:35 -1000
Subject: [PATCH] 2.2.0: use of gradle 1.6 (+ minor bug fix)

---
 RELEASE.md                                    |   5 ++++
 build.gradle                                  |   2 +-
 .../org/linkedin/gradle/core/BuildInfo.groovy |   4 ++-
 .../gradle/plugins/ReleasePlugin.groovy       |  15 +++++-------
 .../linkedin/gradle/plugins/SpecPlugin.groovy |  23 ++++++++++--------
 gradle/wrapper/gradle-wrapper.jar             | Bin 46735 -> 46742 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 +--
 project-spec.groovy                           |   2 +-
 8 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 6a8cdb8..00c8d61 100644
--- a/RELEASE.md
+++ b/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_
diff --git a/build.gradle b/build.gradle
index 340c2b1..d9f9b3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,5 +49,5 @@ subprojects { p ->
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '1.5'
+  gradleVersion = '1.6'
 }
diff --git a/buildSrc/src/main/groovy/org/linkedin/gradle/core/BuildInfo.groovy b/buildSrc/src/main/groovy/org/linkedin/gradle/core/BuildInfo.groovy
index efd1ea7..1f6b2c8 100644
--- a/buildSrc/src/main/groovy/org/linkedin/gradle/core/BuildInfo.groovy
+++ b/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()
       }
     }
   }
diff --git a/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/ReleasePlugin.groovy b/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/ReleasePlugin.groovy
index 85851a6..4d1b004 100644
--- a/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/ReleasePlugin.groovy
+++ b/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
   }
 
diff --git a/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/SpecPlugin.groovy b/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/SpecPlugin.groovy
index 1da0bd5..cdca378 100644
--- a/buildSrc/src/main/groovy/org/linkedin/gradle/plugins/SpecPlugin.groovy
+++ b/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()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 42d9b0e9c5872910311a1d035995ab8ec466e7ac..faa569a9a0eedc9ff37450fed24a7efd77a86729 100644
GIT binary patch
delta 1766
zcmZWp3ou+)7(RP<S(ddVY}GX(;<1)?S&uxVsLTk<ZdO8LNW8MCQQD-KXi5j8BPNM1
zPCP1V1iR~PS&y1(I&{+1qeYBFnv}GusG^$6bWFyiJ@;IVuHKnD-+#aJ|KI=r=ltg?
zSBZ*Mf-4VWvN!-38G(`u*`-`(BLqS5)^V$)ekXS?Ed0DcfNd8ga#8JNQZORG@XUh(
z=)(AkLY)bbNmw8wXmKSvqXhu)0KE<{-;58Jn|QF7)q~yA3?`Y_2r%|Ez($5yEE^kB
zR=arEc;d*Rm)2cB=3wSS?{{cp(cgf;%v#_lY-1|jbBXh)92SNIMVlRyM*JalKkgwu
z>EYca_URV;%FkcmMtF!lyq^dKqZ1P8>#luLktBR1bVmC9$S*?ScWxu&(q6qrvyrAK
z-KKOHmCs=SU=3hNn@z5d?92DQwl|-<SS~CoNSe-9#j1p1tsOJ@6K16h6Yb1xQA+iL
zn}26yM{6d`n|-fdFDI_a(^;xFO^?;vtsnema?aUgx1c}-h{g<#T#(}%tdxAvI5Zyf
zxan<0<*C@=kh?$r;1<u3xjj9_=l^zexIHdi=haa@YsK5FKYm0m<8OR>tG~qk-ui1V
z_S|_fJ#?fp=h0|Q!ht9u+p4cT$7z1$qdcqJxrT<M`*Yk}J8z|l%5dfLtidGJ%?7)T
zfXPqew+|Eb2nmTh6QRyi;>Dy4m@Hkw#0l93fel&2GHo1=EMs71D(WE{8`{%OI7l~}
zaF8}E6@CU5)ZRV6JL#`R`=(|BZ~!LC9HCbGitc)fmX?sE`p^=E=~FZlli5Y5G0U1Y
z$LdR$)@f$`@&aw#E@m6h6_hdQeD}(q(o17id0WcWfh_D(T02QIiaI&%(_df4G@^<t
z$hlGgBh&$wJ7=Xw>=OkW)j}q^18_?1{qinAuI3Oma8RNVVa(C^V(iuUWBf}a!+5mm
z9L9krDMsVwXpD;HSd7EX5g7R`VKm=DuYc8Y0)JbzMqzxn^$f=8*6{z#x1cS=j%q-E
zGSP@`J&pM+sBCkg`iBE;WWZ)90O!(^Mak)jinOz$GifOzc^HGRWYQO&k}CTB&xAz+
zfD$$Up8x6~Y|M9)z(9$Y+s*)S{8^<MIsA%VfnGo&e7}7^&fVHh5>gpVOxXvQ+g)(U
zdkQ#}5alT_0N@S1un_3k5st(1I!MAd5{22qfsTEcnn%=F6jrk96ktlyNfIrm5#<U?
zI&Cr4iKsgX*lVp*h$&kwNth|HR)E43PU=iCeIC)_DTqD<xmr_uJPp?hd!HEsz&8iL
zS--MW_^8YQ=B64#vWt!vc9D!c7~B<#Lp@EKTji)J7HTS3FEla}S93Mf3D$MedFtP)
za;QW(9-<`rd5p4<vjYssGK68>be@=Ql6ZUxYmh~|VA~e`1)}d?Mzkwr=&b2RbtExV
zjE?G6xK`}=zvF_R4O$JN675lm?s_GT!5cb1EHRHHrpmD@uYyl)45lSLByp<>(YA2B
zmdD#M2=E444ync^=2eq$vxkl{=_QFPwXm+%&wWQkP>n7$mx*fWX8|DAt0k@u>r~WP
yygU}AZ_WP0=<hLV41k}Wb5}ifUaGgDl5XGVz&<_^tcJ1bz3^h6x#5VKiuwoqxOIL2

delta 1830
zcmZWp4NOy46uy0>l)v(?C=Ue+q5=U5GEfi@l|V}g6<YZbg5a_-ewGX}r?5?wOouvW
zuL?y#R#|~kprwF66GIT4C^#g`h6;0RfS753;FvNXyYD_I)-`$g&O7%z=R4=z(|6$|
zapon#i4`ynOaL%40<sOkXE|<02*M|MA^m5A_S%e${V_&>6-pVReDBPppl1_?S3VTL
zjf@crwWdTqVTFwFXD<@+lmLJy=;6X5^VLvca0^qiS^Z3Ggc|c$*vK<aW@F>wDr*aD
zjJul9M>Cs?O|a+imXB!TSqO{3p2@Ip*v6DpdgW@<82D9W_@3FmpW>$Yy>UJ*u|7T;
zUj|pe`rubfmJ4%dM$=LGyz1vsY5J2_^6qmL@x!AP(M|G!8`9pP_++oQS}Z{sulc3h
zb)drk1<)bN@ypX4x!q2d#RaJwwsl|1+1Fol(l!Nd%4sdz?s&Gy=44~=7gt>ahI=P2
zP8SSy6+}mJ2KqKTw|#rhB<I}POS|ln`Fu@>0sB^PW(M2A?bxT&frroRm*fGz1dr2f
z)`wm%lIq@%oS6T-@^zAP_FX|rV$Bt^fa@2=z0_7M-hsa}`5w2Wm7_Lxm%=sS&w>{1
zXBLP1F7GWIeOxvA8CS)YNJ?j_f+auBR?Vljvn0Jj?VlEh4ZA|J*DpFw^jNH19_kDl
z^F5gewSjy;CS|}};dAUrig`_7LoE7>Hg?8K8Q3!@9%5tTO3DTtq<xyUl{Ux&K`eZf
znE8e#i?jS`^65_=(w_bK8am;sgM*fsJav4A_KcT|(Z&Nb2wF?Zq%;3^ewwhN?!xuz
zp7~$~0EtWhHbYVTI_*N4cuA`~%m7D~RrS-Jtm;@g;Z3=eY4kM;KNoEvg9(aI+jn+@
zr}6cTg$)XKCfav6sMw<0duUs`jao1$s`bWrtoA*OH)=yLF4V?gjH&w=V`rTZqh);p
z#;p2ej6L-tjO&yF+OMR~?<nK&yF-H*V}3&h#>WlOZ|$?UD$<GSe`OZ|Sc7(Q`Bzg!
zL_w!0dzhs%qlN%GRV3qYIHX#S-xgFP;mU_$+O;r^Zx4lyG-+QWNhAs3NSOmXB4Wd8
zA=@)nz#wdy^e2E4G&%Z%@;d^6e+&T#URFa`Qxp-S3p^D=LQWH%)1iqZc8HdaT;QU{
z3>RK{@$UTyba4Wdi>H^zJ06oen_Mt4JITMjn2r8z)&OkRBX)~*f+i9N_&`kyikeB{
za>~*X2TrC~>O@D5R2_PX1ancoP`zCD({#CJo87T+)cncYa|QrFQvlrb$m|1{yidIb
z6X$;E4^g026lezn^@zJOF;T5{$5S6xlZ+kkjoKf-@iZjk5EN>n@S99S62g345sx%H
z?B=wP1mhrfhaEJ7vR1ms{m4CZT*sc0v*5-Poc~>x=uY~nQq*q+3jja8$_7f7f^DF=
z*4mM}*@bJnT{Ng)XEOkT^vKs?sFsh*Ii)3uZYi8obK!FL0X-$nGNhqI3!#5M_s%bA
zaG+-^7srcQN#bT1a(hraho=|TSHpXbCRd2YtiMn@%IWxWuE)Du2tkmn5RH5u32)V_
zwHSJ}MPjW(Z6vX`dZ`39tgN=ut;i#Eq?GH9rsVc|3d>)H2$XpjdK~o>LSbsVuVI&h
Ga{dRU8)+K=

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0026070..8bb195b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/project-spec.groovy b/project-spec.groovy
index 97a5e28..c89ee1d 100644
--- a/project-spec.groovy
+++ b/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'