Merge branch 'master' of https://github.com/rtyler/jruby-gradle-plugin

Author: ysb33r

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v2.0.3
+
+ * s
+
+## v2.0.2
+
+ *  More futzing with [bintray](http://bintray.com) release code
+
+## v2.0.1
+
+ * Add attributes to `build.gradle` for incorporating plugi into
+   [plugins.gradle.org](http://plugins.gradle.org)
+
+## v2.0.0
+
+ * Switch to a fully qualified gradle plugin name: `com.lookout.jruby`
+ * Add the `war` plugin as a dependency to properly build `jrubyWar`
 
 ## v1.1.1
 

README.md

@@ -40,13 +40,13 @@ Create a `build.gradle` file in the root of `fancy-webapp/` with the following:
 
 
 ```groovy
-apply plugin: 'jruby'
+apply plugin: 'com.lookout.jruby'
 
 buildscript {
-    repositories { maven { url 'http://dl.bintray.com/rtyler/jruby' } }
+    repositories { jcenter() }
 
     dependencies {
-      classpath group: 'com.lookout', name: 'jruby-gradle-plugin', version: '1.1.+'
+      classpath group: 'com.lookout', name: 'jruby-gradle-plugin', version: '2.0.+'
     }
 }
 ```
@@ -183,7 +183,7 @@ You can then use that custom Gem repository with:
 ```groovy
 // buildscript {} up here
 
-apply plugin: 'jruby'
+apply plugin: 'com.lookout.jruby'
 
 // Set our custom Gem repository
 jruby.gemrepo_url = 'http://localhost:8989/releases'

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 group = 'com.lookout'
-version = '1.1.1'
+version = '2.0.3'
 
 if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"
@@ -66,6 +66,15 @@ bintray {
     pkg {
         repo = 'jruby'
         name = 'jruby-gradle-plugin'
+        labels = ['jruby']
+
+        version {
+            name = project.version
+            vcsTag = "v${project.version}"
+            attributes = ['gradle-plugin' : 'com.lookout.jruby:com.lookout:jruby-gradle-plugin']
+            desc = "The purpose of plugin is to encapsulate useful Gradle functionality for JRuby projects. Use of this plugin replaces the need for both Bundler and Warbler in JRuby projects."
+
+        }
     }
 }
 bintrayUpload.dependsOn assemble

src/main/groovy/com/lookout/gradle/jruby/JRubyPlugin.groovy renamed to src/main/groovy/com/lookout/jruby/JRubyPlugin.groovy

@@ -1,4 +1,4 @@
-package com.lookout.gradle.jruby
+package com.lookout.jruby
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -12,6 +12,7 @@ import org.gradle.api.file.FileTree
 class JRubyPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.apply plugin: 'java'
+        project.apply plugin: 'war'
         project.extensions.create('jruby', JRubyPluginExtension)
 
         project.repositories {

src/main/groovy/com/lookout/gradle/jruby/JRubyPluginExtension.groovy renamed to src/main/groovy/com/lookout/jruby/JRubyPluginExtension.groovy

@@ -1,3 +1,4 @@
+package com.lookout.jruby
 
 class JRubyPluginExtension {
     // More details here: <http://rubygems-proxy.torquebox.org/>

src/main/resources/META-INF/gradle-plugins/com.lookout.jruby.properties

@@ -0,0 +1 @@
+implementation-class=com.lookout.jruby.JRubyPlugin

src/main/resources/META-INF/gradle-plugins/jruby.properties

@@ -1,4 +1,4 @@
-package com.lookout.gradle.jruby
+package com.lookout.jruby
 
 import org.gradle.api.*
 import org.gradle.api.tasks.*
@@ -24,7 +24,7 @@ class JRubyPluginTest {
         }
         TESTROOT.mkdirs()
         project = ProjectBuilder.builder().build()
-        project.apply plugin: 'jruby'
+        project.apply plugin: 'com.lookout.jruby'
     }
 
     @Test