Skip to content

Commit ef7a4e7

Browse files
committed
Fixed order of the project version property.
1 parent 298c85c commit ef7a4e7

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed

build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ allprojects {
2424
}
2525
}
2626

27+
project.ext.preDexLibs = !project.isCi
28+
29+
subprojects {
30+
project.plugins.whenPluginAdded { plugin ->
31+
if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
32+
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
33+
} else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
34+
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
35+
}
36+
}
37+
}
38+
2739
task clean(type: Delete) {
2840
delete rootProject.buildDir
2941
}

sdk-addon-android-speech/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ apply plugin: 'com.novoda.bintray-release'
1717
apply plugin: 'com.chattylabs.versioning'
1818
apply from: '../buildsystem/android.gradle'
1919

20-
group = 'com.chattylabs.sdk.android'
21-
version = android.defaultConfig.versionName
22-
2320

2421
versioning {
2522

@@ -49,6 +46,9 @@ dependencies {
4946
api project(':sdk-conversational-flow-core')
5047
}
5148

49+
group = 'com.chattylabs.sdk.android'
50+
version = android.defaultConfig.versionName
51+
5252
publish {
5353
userOrg = 'chattylabs'
5454
groupId = project.group

sdk-addon-android-speech/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Version Update
2-
#Tue Aug 07 16:44:50 BST 2018
2+
#Thu Aug 09 14:31:45 BST 2018
33
screen=0
44
major=00
55
sdk=0

sdk-addon-google-speech/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ apply plugin: 'com.novoda.bintray-release'
1717
apply plugin: 'com.chattylabs.versioning'
1818
apply from: '../buildsystem/android.gradle'
1919

20-
group = 'com.chattylabs.sdk.android'
21-
version = android.defaultConfig.versionName
22-
2320

2421
versioning {
2522

@@ -61,6 +58,9 @@ dependencies {
6158
implementation "com.google.cloud:google-cloud-speech:0.55.0-beta"
6259
}
6360

61+
group = 'com.chattylabs.sdk.android'
62+
version = android.defaultConfig.versionName
63+
6464
publish {
6565
userOrg = 'chattylabs'
6666
groupId = project.group

sdk-addon-google-speech/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Version Update
2-
#Tue Aug 07 16:44:53 BST 2018
2+
#Thu Aug 09 14:31:47 BST 2018
33
screen=0
44
major=00
55
sdk=0

sdk-conversational-flow-core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ apply plugin: 'com.novoda.bintray-release'
1717
apply plugin: 'com.chattylabs.versioning'
1818
apply from: '../buildsystem/android.gradle'
1919

20-
group = 'com.chattylabs.sdk.android'
21-
version = android.defaultConfig.versionName
22-
2320

2421
versioning {
2522

@@ -53,6 +50,9 @@ dependencies {
5350
testImplementation 'org.robolectric:robolectric:3.8'
5451
}
5552

53+
group = 'com.chattylabs.sdk.android'
54+
version = android.defaultConfig.versionName
55+
5656
publish {
5757
userOrg = 'chattylabs'
5858
groupId = project.group

sdk-conversational-flow-core/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Version Update
2-
#Tue Aug 07 16:44:51 BST 2018
2+
#Thu Aug 09 14:31:48 BST 2018
33
screen=0
44
major=00
55
sdk=0

0 commit comments

Comments
 (0)