From 710280a299d886c9f032bc7739bb56a30b1073dd Mon Sep 17 00:00:00 2001 From: Rob Spieldenner Date: Tue, 22 Dec 2015 16:13:13 -0800 Subject: [PATCH] Update to latest plugins. Gradle 2.10. --- CHANGELOG.md | 7 +++++ README.md | 12 +++++--- build.gradle | 28 ++++++++++-------- gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- gradlew | 4 +-- .../plugin/plugin/NebulaPluginPlugin.groovy | 3 -- 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 035af24..64d1615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +3.2.0 / 2015-12-22 +================== + +* Publishing plugins 3.0.2 - > 4.4.4 +* nebula.nebula-bintray 3.0.1 -> 3.1.0 +* nebula.nebula-release 2.2.7 -> 3.1.1 + 3.1.1 / 2015-08-25 ================== diff --git a/README.md b/README.md index a4d2d5f..5a365a5 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ Nebula Plugin Plugin [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nebula-plugins/nebula-plugin-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Apache 2.0](https://img.shields.io/github/license/nebula-plugins/nebula-plugin-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0) -Plugin to establish conventions for a nebula-plugins plugin, e.g. publishing, licenses. +Plugin to establish conventions for a nebula-plugins plugin, e.g. publishing, licenses. This plugin is used to help setup our other plugins. It can be used as an example of setting up similar conventions for an organization's gradle plugins. ![Yo Dawg](https://s3.amazonaws.com/uploads.hipchat.com/25234/334670/CgbXYbDuUzuV3JP/plugins.png) Conventions ----------- * Defaults group to com.netflix.nebula -* Applies nebula.maven-publishing +* Applies nebula.maven-publish * Applies and configures nebula.nebula-release and nebula.nebula-bintray Usages @@ -23,7 +23,7 @@ To apply this plugin if using Gradle 2.1 or newer plugins { - id 'nebula.plugin-plugin' version '3.1.1' + id 'nebula.plugin-plugin' version '3.2.0' } If using an older version of Gradle @@ -31,7 +31,7 @@ If using an older version of Gradle buildscript { repositories { jcenter() } dependencies { - classpath 'com.netflix.nebula:nebula-plugin-plugin:3.1.1' + classpath 'com.netflix.nebula:nebula-plugin-plugin:3.2.0' } } @@ -50,6 +50,10 @@ Gradle Compatibility Tested | 2.4 | yes | | 2.5 | yes | | 2.6 | yes | +| 2.7 | yes | +| 2.8 | yes | +| 2.9 | yes | +| 2.10 | yes | LICENSE ======= diff --git a/build.gradle b/build.gradle index b497365..630fc88 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,21 @@ +buildscript { + repositories { + jcenter() + } +} + plugins { id 'groovy' id 'idea' id 'jacoco' - id 'nebula.maven-publishing' version '3.0.2' - id 'nebula.apache-license-pom' version '3.0.2' - id 'nebula.javadoc-jar' version '3.0.2' - id 'nebula.source-jar' version '3.0.2' + id 'nebula.maven-publish' version '4.4.4' + id 'nebula.maven-apache-license' version '4.4.4' + id 'nebula.javadoc-jar' version '4.4.4' + id 'nebula.source-jar' version '4.4.4' id 'nebula.info' version '3.0.3' id 'nebula.contacts' version '3.0.1' - id 'nebula.nebula-release' version '2.2.7' - id 'nebula.nebula-bintray' version '3.0.1' + id 'nebula.nebula-release' version '3.1.1' + id 'nebula.nebula-bintray' version '3.1.0' id 'com.gradle.plugin-publish' version '0.9.1' id 'com.github.kt3k.coveralls' version '2.4.0' id 'org.ysb33r.gradletest' version '0.5.4' @@ -40,9 +46,9 @@ repositories { dependencies { compile localGroovy() compile gradleApi() - compile 'com.netflix.nebula:nebula-core:2.2.0' - compile 'com.netflix.nebula:nebula-bintray-plugin:3.0.1' - compile 'com.netflix.nebula:nebula-release-plugin:2.2.7' + compile 'com.netflix.nebula:nebula-core:3.0.1' + compile 'com.netflix.nebula:nebula-bintray-plugin:3.1.0' + compile 'com.netflix.nebula:nebula-release-plugin:3.1.1' compile 'org.ajoberstar:gradle-git' // using these but just want the version used by nebula-release-plugin testCompile 'org.ajoberstar:grgit' testCompile('com.netflix.nebula:nebula-test:4.0.0') { @@ -77,8 +83,6 @@ pluginBundle { } // Wire up build and publishing process -project.tasks.getByName('verifyReleaseStatus').actions.clear() -project.tasks.getByName('verifySnapshotStatus').actions.clear() tasks.matching { it.name == 'bintrayUpload' || it.name == 'artifactoryPublish'}.all { Task task -> task.mustRunAfter('build') @@ -118,7 +122,7 @@ if (project.hasProperty('release.travisci') && project.property('release.travisc } gradleTest { - versions '2.2.1', '2.3', '2.4', '2.5', '2.6' + versions '2.2.1', '2.3', '2.4', '2.5', '2.6', '2.7', '2.8', '2.9', '2.10' } gradleTest.dependsOn(jar) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 1855 zcmZWp3rtg27(TtXJk)mbS_LnHJmeMSQPk-W70@w65#*skhoFF{Ow4q`1{PuXn8P?Z zU?h@Ep`pg1)V8wWkQ56Pq&zA!YRon?_*&2?(cu`*o%^2wyROO2_n)ud|2+S_hicf8 z8de$`&5EZYWNnT7G!-YLUQz;)w<=DpTZRxyJh439!HIb_{Fw+%3S~s7a$|Yu@&WiG zkO%B5y2qnd%Isl)_)7c;h)*q)KxiGT?Ja@vd+!cqENufVfLSd2mNF*CBr9O%%uccg zLlG>Ynq!M((}1as7?}#jnV4T_zypa^)cxrCL~ALjB2w?Pv^|zI5rc;|huiOtT9Xtg zPY9H2N}C@INpUS%6rUKpI!nRKS( zM)l6HXkCrIOcJ$l^!4S_C3p7^zUWB%TzmDRVn7)okr+hHRgX4x1SCgg$NDB5Iac@E zU`lHB$i=3O7q0A6w`-pIEnfJ3T#n7*DEDOC+<@8Kv{y;UfrO)R>w?bv{srtiz8V z^R~sm^bnPOp|ITf@MYohAl>vCB~LF6hF4y;^VvM`WKo~%Fk_5|@m(3>dSso=`)w6N|uU*^I2WMk|C4+anYTPO|IH z+UMD3D{yGt>&k-hFgJu6p85S2z>FRk6@f8Qe3OcMkD4h{Q~Etk6L4vJ|kqB?j<8OAg@rYij^i*ERq$h7`c926}EbY=pCO>ngzQt#N=?TcZJ| zwNYJWTRfbb+7baB+G*VM_N{Qf-oE;sm%_ui!j*4(V);b~Ig-}Lf4ZVfe8}j{&l{_a zoM;C&8C~G?)W|WFX*jUQ3HPSW#GxG$pjUTrjAuFyOZS@_8!ciSSo&GvbF2%WGV2_< zrV(;YOU4rr)D_ue5C;z&o5A5X|HhGYa*SOTK3ngLH)P51Gm~UCALFrybU2dK7){~? z31a-cgT!#g>P`<33f5B~EYHT5vX|lJE?RKdb&hG+3yH?|+Ds%G+;Y?V9!au`tT_J> z9RKNxZs$U=j(IM83`pkwWoL4k1wxflguKR;1a(ESe5h(|z6Af&PQ_K(n|f8Gg<2M& zMFR2A0Vv}_*DM%icNfPzDaNPk+_A(2Zv%ESaiSI+YKj8E*CvjsD1~Y|O+i4tAymY1 zLb>B5-P9+pn`54x1(kob-T!VS(wsR|MjEXm^#=>exvzwBUUxgfisX6SPe>IbG;=O6p1c|6D{b$K+~YTx!j9exYEt5oX!L-^r*7 zNLu06+|oi*w|l*zK8!*t3&>o@NHdECi8$=i_c7GBy^qYIkYx{G7Xa?2Dw&;0|3WSSoU delta 1773 zcmZ8h3s96*6u$fK0xPiO@^W#p1&q)}aM{Qg68MNU9xJP$j#h$cG6R|-LP4bqXo)xo zCmnRGB#~vv$Hs0LO5?%;%P#C9m8CN}L8AE}c{GC&Cf)!1g026|&Ufy2&v(u}=bpPo zr}+C%@kL4Te1R(=LLoUAA66!MSwunkwK}Idnh=s)7PH#>*k4&gSv=zCs14+^{vERr zM&vBOY+f&mdJ(gWL84Ib2NK(ys*uoo3%#6?dBx*8$2g1SPRK0uJK1P83~ zLgSNH-8r8_3w+&>sb2QT6^)asn_R%XDK4D6cx{Rhi}1_d`9MvJSPA_bmwF3Tp-J)x zwOnUV)aew8RXcJ-9Esa=QWcR+{HuW)esF&#sLY3b|=>_!RZkX`eBy z0pXkPAu(giI1+kU`aRBY%K#p3Rc6YBXqd8Pd^B$7M)Ez_z6Ir3)|WdGa!drgLLb;s z>ZVua*Epfm=-z)g{Yb%87i8?k-8?ZXQ)I5Kk7EcCP-!f5XTJpI&S3p$Nivr?skFuu z1!I*%95YbW!x=wn>jk)V@C=_jOWFBBZmX#7Z7yG*ehKF@>-#GlGuDvIVB*+%;iD)% zA=W8`L}KDnn-jQq`{=)HRPsI9v)!m|nxdqm@CN2<{NCKckXruPw3niCOEH?L!{-1H7E(@eO8 zM$-mdPj87s+}ff>ywnnpIHi^I+uXVu*B4t;5Ix(tu$$W6#dUjI!gEg}(7as6mOc3b zc!Wr3=@XwpvlWWWA#Bg#oLS1t0IT^$Ts<&Lnd52DtMvnW+H{C)cSky|UCIP+hHpz| zLUFqnQYR@T-hxz5I~U5;B4xbNVaPrkk}N@Zg1a+C!%CVxo(@L%M0$z_%{Y`a3Zr?liX)``@BV@5d8Q1jGc_#eQh1XnuMauIB|0^r7_)wqp z0vDR_l7J9}gKD4wRiPKfAh&Xza(Jl@&asWO2T>q2bC=`zUY~gyG&dljTj88)WV!zU Djev9M diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d7faaf9..3942a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 15 13:44:19 PDT 2015 +#Tue Dec 22 15:57:34 PST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip diff --git a/gradlew b/gradlew index 97fac78..9d82f78 100755 --- a/gradlew +++ b/gradlew @@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar diff --git a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy index bf3a63f..101e7c7 100644 --- a/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy +++ b/src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy @@ -40,9 +40,6 @@ class NebulaPluginPlugin implements Plugin { project.group = 'com.netflix.nebula' } - project.tasks.getByName('verifyReleaseStatus').actions.clear() - project.tasks.getByName('verifySnapshotStatus').actions.clear() - project.tasks.matching { it.name == 'bintrayUpload' || it.name == 'artifactoryPublish'}.all { Task task -> task.mustRunAfter('build') project.rootProject.tasks.release.dependsOn(task)