From 142d7bebae3ed8f988557294093eff9e516fc7b1 Mon Sep 17 00:00:00 2001
From: David Bernard <d.bernard1@ssi.samsung.com>
Date: Thu, 28 Jan 2016 22:06:21 +0100
Subject: [PATCH] build: upload on bintray from travis when a git tag is set
 and it starts by jmeMainVersion

---
 .travis.yml       |  3 +++
 bintray.gradle    | 26 ++++++++++++++++++++++++++
 build.gradle      |  8 ++++++--
 common.gradle     |  2 +-
 gradle.properties |  4 ++++
 version.gradle    |  6 +++++-
 6 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 bintray.gradle

diff --git a/.travis.yml b/.travis.yml
index 48e75d0b4..8874544b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,3 +54,6 @@ before_install:
   # wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin -O ndk.bin
   # 7z x ndk.bin -y > /dev/null
   # export ANDROID_NDK=`pwd`/android-ndk-r10c
+
+after_success:
+  - '[ -n "$TRAVIS_TAG"" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew bintrayUpload || :'
diff --git a/bintray.gradle b/bintray.gradle
new file mode 100644
index 000000000..74671c6a5
--- /dev/null
+++ b/bintray.gradle
@@ -0,0 +1,26 @@
+//
+// This file is to be applied to some subproject.
+//
+
+apply plugin: 'com.jfrog.bintray'
+
+bintray {
+    user = bintray_user
+    key = bintray_api_key
+    configurations = ['archives']
+    pkg {
+        repo = 'org.jmonkeyengine'
+        userOrg = 'jmonkeyengine'
+        name = project.name
+        desc = POM_DESCRIPTION
+        websiteUrl = POM_URL
+        licenses = ['BSD New']
+        vcsUrl = POM_SCM_CONNECTION
+        labels = ['jmonkeyengine']
+    }
+}
+
+bintrayUpload.onlyIf {
+    (bintray_api_key.length() > 0) &&
+    !(version ==~ /.*SNAPSHOT/)
+}
diff --git a/build.gradle b/build.gradle
index 192bc32d3..2d4fe1e3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,11 @@ import org.gradle.api.artifacts.*
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
     }
 }
 
@@ -17,6 +18,9 @@ apply from: file('upload.gradle')
 subprojects {
     if(!project.name.equals('jme3-android-examples')) {
         apply from: rootProject.file('common.gradle')
+        if (!['jme3-testdata', 'sdk'].contains(project.name)) {
+            apply from: rootProject.file('bintray.gradle')
+        }
     } else {
         apply from: rootProject.file('common-android-app.gradle')
     }
@@ -174,4 +178,4 @@ task configureAndroidNDK {
 //    tasks.withType(Test) {
 //        enableAssertions = true // true by default
 //    }
-//}
\ No newline at end of file
+//}
diff --git a/common.gradle b/common.gradle
index 237ee5e7f..5da5ce9d1 100644
--- a/common.gradle
+++ b/common.gradle
@@ -5,7 +5,7 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-group = 'com.jme3'
+group = 'org.jmonkeyengine'
 version = jmePomVersion
 
 sourceCompatibility = '1.6'
diff --git a/gradle.properties b/gradle.properties
index 4380c31a0..f4c74445a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,3 +37,7 @@ POM_SCM_DEVELOPER_CONNECTION=scm:git:git@github.com:jMonkeyEngine/jmonkeyengine.
 POM_LICENSE_NAME=New BSD (3-clause) License
 POM_LICENSE_URL=http://opensource.org/licenses/BSD-3-Clause
 POM_LICENSE_DISTRIBUTION=repo
+
+# Bintray settings to override in $HOME/.gradle/gradle.properties or ENV or commandline
+bintray_user=
+bintray_api_key=
diff --git a/version.gradle b/version.gradle
index 40e934278..55982039b 100644
--- a/version.gradle
+++ b/version.gradle
@@ -76,7 +76,11 @@ task configureVersionInfo {
         jmeFullVersion = jmeMainVersion
         jmePomVersion  = jmeVersion
         
-        if (jmeBranchName != "master") {
+        if (jmeGitTag.startsWith(jmeMainVersion)) {
+            jmeVersionTag = ""
+            jmePomVersion = jmeGitTag
+        }
+        if (jmeBranchName != "master" && jmeVersionTag == "SNAPSHOT") {
             jmeFullVersion += "-${jmeBranchName}"
             jmePomVersion  += "-${jmeBranchName}"