From b13279325f9f5d484a4e36d0e0d2ec9a7dbff946 Mon Sep 17 00:00:00 2001
From: Elias Lecomte <elias.lecomte@inthepocket.mobi>
Date: Fri, 30 Dec 2016 14:24:03 +0100
Subject: [PATCH] - Update version number - Update bintray configuration &
 gradle.properties names

---
 app/build.gradle            |  4 ++--
 build.gradle                |  2 +-
 gradle.properties           | 15 +++++++++------
 ibeaconscanner/build.gradle | 32 +++++++++++++++++---------------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8496c3b..1fada2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,12 +19,12 @@ android {
     buildToolsVersion "25.0.1"
 
     defaultConfig {
-        applicationId "mobi.inthepocket.android.beacons.app"
+        applicationId appApplicationId
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
         versionName "1"
-        testInstrumentationRunner "mobi.inthepocket.android.beacons.app.TestRunner"
+        testInstrumentationRunner appTestRunner
     }
 
     buildTypes {
diff --git a/build.gradle b/build.gradle
index b53db56..feb0111 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,6 @@ allprojects {
 
 sonarqube {
     properties {
-        property "sonar.projectVersion", projectVersion
+        property "sonar.projectVersion", projectVersionName
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 7013d0c..4de81ff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,14 @@
 # Project-wide Gradle settings.
 
-projectVersion=1.2.0
-projectVersionCode=3
-projectApplicationId=mobi.inthepocket.android.beacons.ibeaconscanner
-projectDescription=Android library to scan for iBeacons.
-projectUrl=https://github.com/inthepocket/ibeacon-scanner-android
-projectGit=https://github.com/inthepocket/ibeacon-scanner-android.git
+projectVersionName=1.3.0
+projectVersionCode=5
 
+appApplicationId=mobi.inthepocket.android.beacons.app
+appTestRunner=mobi.inthepocket.android.beacons.app.TestRunner
+
+libDescription=Android library to scan for iBeacons.
+libUrl=https://github.com/inthepocket/ibeacon-scanner-android
+libGit=https://github.com/inthepocket/ibeacon-scanner-android.git
+libLicenseUrl=https://github.com/inthepocket/ibeacon-scanner-android/blob/master/LICENSE.md
 libGroupId=mobi.inthepocket.android
 libArtifactId=ibeaconscanner
diff --git a/ibeaconscanner/build.gradle b/ibeaconscanner/build.gradle
index a4c702b..f042f87 100644
--- a/ibeaconscanner/build.gradle
+++ b/ibeaconscanner/build.gradle
@@ -3,15 +3,17 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 apply from: '../jacoco.gradle'
 
+// for Bintray
 def projectVersionCodeNr = Integer.parseInt(projectVersionCode);
-def projectGit = projectGit;
-def projectUrl = projectUrl;
-def projectDescription = projectDescription
+def libGit = libGit;
+def libUrl = libUrl;
+def libDescription = libDescription
 def libGroupId = libGroupId;
 def libArtifactId = libArtifactId;
 
+// for Maven
 group = libGroupId
-version = projectVersion
+version = projectVersionName
 
 if (System.env.TRAVIS == 'true') {
     allprojects {
@@ -34,7 +36,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode projectVersionCodeNr
-        versionName projectVersion
+        versionName projectVersionName
         consumerProguardFiles 'proguard-rules.pro'
 
         buildConfigField 'long', 'BEACON_EXIT_TIME_IN_MILLIS', '20L * 1000L'
@@ -77,19 +79,19 @@ install {
     repositories.mavenInstaller {
         pom.project {
             name libArtifactId
-            description projectDescription
-            url projectUrl
+            description libDescription
+            url libUrl
             inceptionYear '2016'
 
             packaging 'aar'
             groupId libGroupId
             artifactId libArtifactId
-            version projectVersion
+            version projectVersionName
 
             licenses {
                 license {
                     name 'MIT'
-                    url 'https://github.com/inthepocket/ibeacon-scanner-android/blob/master/LICENSE.md'
+                    url libLicenseUrl
                 }
             }
         }
@@ -97,19 +99,19 @@ install {
 }
 
 bintray {
-    user = hasProperty('bintray_user') ? bintray_user : System.getenv('bintray_user')
-    key = hasProperty('bintray_apikey') ? bintray_apikey : System.getenv('bintray_apikey')
+    user = bintray_user
+    key = bintray_apikey
     pkg {
         repo = libGroupId
         name = libArtifactId
-        userOrg = hasProperty('bintray_user') ? bintray_user : System.getenv('bintray_user')
+        userOrg = bintray_user_org
         licenses = ['MIT']
-        vcsUrl = projectGit
+        vcsUrl = libGit
         version {
-            name = projectVersion
+            name = projectVersionName
             gpg {
                 sign = true
-                passphrase = hasProperty('bintray_gpg_phrase') ? bintray_gpg_phrase : System.getenv('bintray_gpg_phrase')
+                passphrase = bintray_gpg_phrase
             }
         }
     }