From b80aac87d86cf61c6a07c43fbe88824adbbee5f1 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Fri, 14 Aug 2015 21:18:29 -0700
Subject: [PATCH] Move the bintray uploading into the main project directory

---
 build.gradle            | 54 ++++++++++++++++++++++++++++++++++-------
 gradle/releasing.gradle | 44 ---------------------------------
 2 files changed, 45 insertions(+), 53 deletions(-)
 delete mode 100644 gradle/releasing.gradle

diff --git a/build.gradle b/build.gradle
index cf541da..42fa6dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,27 +12,22 @@ apply plugin: 'java'
 apply plugin: 'groovy'
 apply plugin: 'maven'
 apply plugin: 'codenarc'
-apply from: 'gradle/releasing.gradle'
+apply plugin: 'com.jfrog.bintray'
 
-version = '0.1.2'
+version = '0.1.3'
 group = 'com.github.jrubygradle'
 description = 'A library for managing Ruby gems'
 defaultTasks 'check', 'assemble'
 
 repositories {
     jcenter()
-    mavenLocal()
 }
 
 dependencies {
-    compile "org.codehaus.groovy:groovy-all:2.4.0+"
-
     compile 'org.slf4j:slf4j-api:1.7.12+'
     /* using the simple logger at runtime, no need for it at compile time though */
     runtime 'org.slf4j:slf4j-simple:1.7.12+'
 
-    compile 'joda-time:joda-time:2.6+'
-
     /* Used for processing yaml files inside of gems */
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.4'
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.4'
@@ -42,8 +37,6 @@ dependencies {
     compile "org.jboss.shrinkwrap:shrinkwrap-bom:1.2.2+"
     compile "org.jboss.shrinkwrap:shrinkwrap-depchain:1.2.2+"
 
-    codenarc "org.codenarc:CodeNarc:0.24"
-
     testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
     testCompile 'org.apache.commons:commons-io:1.3.2+'
 
@@ -77,6 +70,49 @@ plugins.withType(JavaPlugin) {
     }
 }
 
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task groovydocJar(type: Jar) {
+    dependsOn groovydoc
+    classifier = 'groovydoc'
+    from groovydoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives groovydocJar
+}
+
+bintray {
+    user = project.bintrayUser
+    key = project.bintrayKey
+    publish = true
+    configurations = ['archives']
+    /*
+     * Only only publish when we're tagging a release and if we've executed on
+     * the JDK7 build. This is to prevent multiple attempts by the build matrix
+     * to publish the artifacts
+     */
+    dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk7'))
+
+    pkg {
+        userOrg = 'jruby-gradle'
+        repo = 'libraries'
+        name = 'jem'
+        labels = ['jruby','java']
+
+        version {
+            name = project.version
+            vcsTag = "v${project.version}"
+            desc = project.description
+        }
+    }
+}
+bintrayUpload.dependsOn assemble
 assemble.dependsOn check
 assemble.dependsOn groovydocJar
 assemble.dependsOn sourcesJar
+
diff --git a/gradle/releasing.gradle b/gradle/releasing.gradle
deleted file mode 100644
index 17f573f..0000000
--- a/gradle/releasing.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task groovydocJar(type: Jar) {
-    dependsOn groovydoc
-    classifier = 'groovydoc'
-    from groovydoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives groovydocJar
-}
-
-bintray {
-    user = project.bintrayUser
-    key = project.bintrayKey
-    publish = true
-    configurations = ['archives']
-    /*
-     * Only only publish when we're tagging a release and if we've executed on
-     * the JDK7 build. This is to prevent multiple attempts by the build matrix
-     * to publish the artifacts
-     */
-    dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk7'))
-
-    pkg {
-        userOrg = 'jruby-gradle'
-        repo = 'libraries'
-        name = 'jem'
-        labels = ['jruby','java']
-
-        version {
-            name = project.version
-            vcsTag = "v${project.version}"
-            desc = project.description
-        }
-    }
-}
-bintrayUpload.dependsOn assemble