Merge pull request #25 from rspieldenner/fixversionpublish

Fix bintray publish so version is calculated later

CHANGELOG.md

@@ -1,3 +1,8 @@
+3.0.5 / 2015-08-17
+==================
+
+* Switch order of plugins to fix ordering issue until we can get back around to nebula-bintray
+
 3.0.4 / 2015-08-14
 ==================
 

README.md

@@ -23,15 +23,15 @@ To apply this plugin if using Gradle 2.1 or newer
 
 
     plugins {
-      id 'nebula.plugin-plugin' version '3.0.4'
+      id 'nebula.plugin-plugin' version '3.0.5'
     }
 
 If using an older version of Gradle
 
     buildscript {
       repositories { jcenter() }
       dependencies {
-        classpath 'com.netflix.nebula:nebula-plugin-plugin:3.0.4'
+        classpath 'com.netflix.nebula:nebula-plugin-plugin:3.0.5'
       }
     }
 

src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy

@@ -30,8 +30,8 @@ import org.gradle.api.execution.TaskExecutionGraph
 class NebulaPluginPlugin implements Plugin<Project> {
     @Override
     void apply(Project project) {
-        project.plugins.apply(BintrayPlugin)
         project.plugins.apply(ReleasePlugin)
+        project.plugins.apply(BintrayPlugin)
 
         project.logger.lifecycle("Enabling Nebula for this project ${project.name}")
 

src/test/groovy/nebula/plugin/plugin/NebulaPluginPluginSpec.groovy

@@ -15,13 +15,24 @@
  */
 package nebula.plugin.plugin
 
+import com.jfrog.bintray.gradle.BintrayExtension
 import nebula.test.PluginProjectSpec
 import org.ajoberstar.grgit.Grgit
 
 class NebulaPluginPluginSpec extends PluginProjectSpec {
     String pluginName = 'nebula.plugin-plugin'
 
     def setup() {
-        Grgit.init(dir: projectDir)
+        def grgit = Grgit.init(dir: projectDir)
+        grgit.commit(message: 'initial commit')
+    }
+
+    def 'check version is properly set'() {
+        when:
+        project.plugins.apply NebulaPluginPlugin
+
+        then:
+        def bintrayExt = project.extensions.findByType(BintrayExtension)
+        bintrayExt.pkg.version.name.contains('0.1.0-dev.')
     }
 }