Updated versioning plugin to accept mavenLocal or jCenter

FranRiadigos · FranRiadigos · commit b2add68fc11e · 2018-08-08T17:40:48.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -105,4 +105,9 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk
+
+
+## Custom
+
+version.properties
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,9 @@
-plugins {
-    id 'com.chattylabs.versioning' version '0.19.3'
-}
-
 repositories {
     maven { url "https://dl.bintray.com/chattylabs/maven" }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.chattylabs.versioning'
 apply from: '../buildsystem/android.gradle'
 
 versioning {
diff --git a/app/src/main/java/com/chattylabs/demo/voice/MainActivity.java b/app/src/main/java/com/chattylabs/demo/voice/MainActivity.java
@@ -80,11 +80,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.demo_conversation:
                 ContextCompat.startActivity(this,
                         new Intent(this, ConversationCreatorActivity.class), null);
+                return true;
             case R.id.demo_components:
                 ContextCompat.startActivity(this,
                         new Intent(this, MainActivity.class), null);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
-        return super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     ext.kotlin_version = '1.2.30'
     repositories {
+        mavenLocal()
         google()
         jcenter()
         mavenCentral()
@@ -9,6 +10,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
+        classpath 'com.chattylabs:versioning:+'
     }
 }
 
diff --git a/sdk-addon-android-speech/build.gradle b/sdk-addon-android-speech/build.gradle
@@ -7,16 +7,13 @@ buildscript {
     }
 }
 
-plugins {
-    id 'com.chattylabs.versioning' version '0.19.3'
-}
-
 repositories {
     maven { url "https://dl.bintray.com/chattylabs/maven" }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.chattylabs.versioning'
 apply from: '../buildsystem/android.gradle'
 
 group = 'com.chattylabs.sdk.android'
diff --git a/sdk-addon-android-speech/version.properties b/sdk-addon-android-speech/version.properties
@@ -1,6 +1,7 @@
-#Sat Jul 14 16:31:45 UTC 2018
+#Version Update
+#Tue Aug 07 16:44:50 BST 2018
 screen=0
 major=00
-sdk=00
-minor=13
-patch=14
+sdk=0
+minor=07
+patch=15
diff --git a/sdk-addon-google-speech/build.gradle b/sdk-addon-google-speech/build.gradle
@@ -7,16 +7,13 @@ buildscript {
     }
 }
 
-plugins {
-    id 'com.chattylabs.versioning' version '0.19.3'
-}
-
 repositories {
     maven { url "https://dl.bintray.com/chattylabs/maven" }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.chattylabs.versioning'
 apply from: '../buildsystem/android.gradle'
 
 group = 'com.chattylabs.sdk.android'
diff --git a/sdk-addon-google-speech/version.properties b/sdk-addon-google-speech/version.properties
@@ -1,6 +1,7 @@
-#Wed Jul 11 11:35:10 UTC 2018
+#Version Update
+#Tue Aug 07 16:44:53 BST 2018
 screen=0
 major=00
-sdk=00
-minor=13
-patch=14
+sdk=0
+minor=04
+patch=03
diff --git a/sdk-conversational-flow-core/build.gradle b/sdk-conversational-flow-core/build.gradle
@@ -7,16 +7,13 @@ buildscript {
     }
 }
 
-plugins {
-    id 'com.chattylabs.versioning' version '0.19.3'
-}
-
 repositories {
     maven { url "https://dl.bintray.com/chattylabs/maven" }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.chattylabs.versioning'
 apply from: '../buildsystem/android.gradle'
 
 group = 'com.chattylabs.sdk.android'
@@ -25,11 +22,11 @@ version = android.defaultConfig.versionName
 
 versioning {
 
-    tagPrefix "conv-flow-version/"
+    tagPrefix "core-version/"
 
     keywords {
-        minor "[conv-flow-feature]"
-        patch "[conv-flow-bug]", "[conv-flow-patch]"
+        minor "[core-feature]"
+        patch "[core-bug]", "[core-patch]"
     }
 }
 
diff --git a/sdk-conversational-flow-core/version.properties b/sdk-conversational-flow-core/version.properties
@@ -1,6 +1,7 @@
-#Wed Jul 11 11:35:10 UTC 2018
+#Version Update
+#Tue Aug 07 16:44:51 BST 2018
 screen=0
 major=00
-sdk=00
-minor=13
-patch=14
+sdk=0
+minor=14
+patch=00
diff --git a/version.properties b/version.properties

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext.kotlin_version = '1.2.30'`
`3`	`3`	`repositories {`
	`4`	`+ mavenLocal()`
`4`	`5`	`google()`
`5`	`6`	`jcenter()`
`6`	`7`	`mavenCentral()`
`@@ -9,6 +10,7 @@ buildscript {`
`9`	`10`	`classpath 'com.android.tools.build:gradle:3.1.3'`
`10`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`12`	`classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'`
	`13`	`+ classpath 'com.chattylabs:versioning:+'`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,13 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`		`-plugins {`
`11`		`- id 'com.chattylabs.versioning' version '0.19.3'`
`12`		`-}`
`13`		`-`
`14`	`10`	`repositories {`
`15`	`11`	`maven { url "https://dl.bintray.com/chattylabs/maven" }`
`16`	`12`	`}`
`17`	`13`
`18`	`14`	`apply plugin: 'com.android.library'`
`19`	`15`	`apply plugin: 'com.novoda.bintray-release'`
	`16`	`+apply plugin: 'com.chattylabs.versioning'`
`20`	`17`	`apply from: '../buildsystem/android.gradle'`
`21`	`18`
`22`	`19`	`group = 'com.chattylabs.sdk.android'`