Skip to content

Commit 7513c70

Browse files
committed
Updated buildsystem and added versioning plugin.
1 parent 0060a3d commit 7513c70

File tree

7 files changed

+92
-5
lines changed

7 files changed

+92
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ After you have cloned this project, run the following command on a terminal cons
158158
git submodule update --init
159159
```
160160

161-
## Who use this library?
161+
## Whose use this library?
162162
This is a list of Apps using the library:
163163

164164
<a href="https://play.google.com/store/apps/details?id=com.Chatty"><img src="https://lh3.googleusercontent.com/BwP_HPbu2G523jUQitRcfgADe5qKxZclxAbESmM4xaTNFS3ckz5uqkh12OimzqPC=s50-rw" alt="Chatty" title="Chatty"/> &nbsp;&nbsp;

app/build.gradle

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
1+
plugins {
2+
id 'com.chattylabs.versioning' version '0.19.3'
3+
}
4+
15
repositories {
26
maven { url "https://dl.bintray.com/chattylabs/maven" }
37
}
8+
49
apply plugin: 'com.android.application'
510
apply from: '../buildsystem/android.gradle'
611

12+
versioning {
13+
14+
tagPrefix "demo-version/"
15+
16+
keywords {
17+
minor "[demo-feature]"
18+
patch "[demo-bug]", "[demo-patch]"
19+
}
20+
}
21+
722
android {
823
defaultConfig {
24+
versionCode versioning.code()
25+
versionName versioning.name()
926
applicationId "com.chattylabs.demo.voice_interaction.conversational_flow"
1027
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1128

@@ -64,6 +81,7 @@ dependencies {
6481
}
6582

6683
task copySecretKey(type: Copy) {
84+
// Search this on internet and ADD the Env Variable on your Machine.
6785
def File secretKey = file "$System.env.GOOGLE_APPLICATION_CREDENTIALS"
6886
from secretKey.getParent()
6987
include secretKey.getName()

build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
apply from: 'buildsystem/versioning.gradle'
2-
31
buildscript {
42
ext.kotlin_version = '1.2.30'
53
repositories {
@@ -26,3 +24,11 @@ allprojects {
2624
task clean(type: Delete) {
2725
delete rootProject.buildDir
2826
}
27+
28+
File buildsystem = file("buildsystem")
29+
if (!buildsystem.exists() || buildsystem.list().length == 0) {
30+
println "Initializing buildsystem..."
31+
exec {
32+
commandLine "git", "submodule", "update", "--init"
33+
}
34+
}

sdk-addon-android-speech/build.gradle

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,38 @@ buildscript {
66
classpath 'com.novoda:bintray-release:0.8.1'
77
}
88
}
9+
10+
plugins {
11+
id 'com.chattylabs.versioning' version '0.19.3'
12+
}
13+
914
repositories {
1015
maven { url "https://dl.bintray.com/chattylabs/maven" }
1116
}
17+
1218
apply plugin: 'com.android.library'
1319
apply plugin: 'com.novoda.bintray-release'
1420
apply from: '../buildsystem/android.gradle'
1521

1622
group = 'com.chattylabs.sdk.android'
1723
version = android.defaultConfig.versionName
1824

25+
26+
versioning {
27+
28+
tagPrefix "addon-android-version/"
29+
30+
keywords {
31+
minor "[addon-android-feature]"
32+
patch "[addon-android-bug]", "[addon-android-patch]"
33+
}
34+
}
35+
1936
android {
37+
defaultConfig {
38+
versionCode versioning.code()
39+
versionName versioning.name()
40+
}
2041
//compileSdkVersion 21
2142
}
2243

sdk-addon-google-speech/build.gradle

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,38 @@ buildscript {
66
classpath 'com.novoda:bintray-release:0.8.1'
77
}
88
}
9+
10+
plugins {
11+
id 'com.chattylabs.versioning' version '0.19.3'
12+
}
13+
914
repositories {
1015
maven { url "https://dl.bintray.com/chattylabs/maven" }
1116
}
17+
1218
apply plugin: 'com.android.library'
1319
apply plugin: 'com.novoda.bintray-release'
1420
apply from: '../buildsystem/android.gradle'
1521

1622
group = 'com.chattylabs.sdk.android'
1723
version = android.defaultConfig.versionName
1824

25+
26+
versioning {
27+
28+
tagPrefix "addon-google-version/"
29+
30+
keywords {
31+
minor "[addon-google-feature]"
32+
patch "[addon-google-bug]", "[addon-google-patch]"
33+
}
34+
}
35+
1936
android {
37+
defaultConfig {
38+
versionCode versioning.code()
39+
versionName versioning.name()
40+
}
2041
//compileSdkVersion 21
2142
}
2243

sdk-conversational-flow-core/build.gradle

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,38 @@ buildscript {
66
classpath 'com.novoda:bintray-release:0.8.1'
77
}
88
}
9+
10+
plugins {
11+
id 'com.chattylabs.versioning' version '0.19.3'
12+
}
13+
914
repositories {
1015
maven { url "https://dl.bintray.com/chattylabs/maven" }
1116
}
17+
1218
apply plugin: 'com.android.library'
1319
apply plugin: 'com.novoda.bintray-release'
1420
apply from: '../buildsystem/android.gradle'
1521

1622
group = 'com.chattylabs.sdk.android'
1723
version = android.defaultConfig.versionName
1824

25+
26+
versioning {
27+
28+
tagPrefix "conv-flow-version/"
29+
30+
keywords {
31+
minor "[conv-flow-feature]"
32+
patch "[conv-flow-bug]", "[conv-flow-patch]"
33+
}
34+
}
35+
1936
android {
37+
defaultConfig {
38+
versionCode versioning.code()
39+
versionName versioning.name()
40+
}
2041
testOptions {
2142
//unitTests.returnDefaultValues = true
2243
}
@@ -40,5 +61,5 @@ publish {
4061
artifactId = project.name.replace("sdk-", "")
4162
publishVersion = project.version
4263
desc = 'Conversational Flow Component (VUI SDK)'
43-
website = 'https://github.com/chattylabs/sdk-conversational-flow'
64+
website = 'https://github.com/chattylabs/android-sdk-conversational-flow'
4465
}

0 commit comments

Comments
 (0)