Skip to content

Commit 1ece5ec

Browse files
committed
If the parameter is not provided it should be true by default
Remove version.properties & create empty credential.json for CI
1 parent ef7a4e7 commit 1ece5ec

File tree

7 files changed

+11
-18
lines changed

7 files changed

+11
-18
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,5 @@ $RECYCLE.BIN/
110110
*.lnk
111111

112112
## Custom
113-
version.properties
113+
version.properties
114+
/*/version.properties

build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ 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-
3927
task clean(type: Delete) {
4028
delete rootProject.buildDir
4129
}

buildsystem

demo/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ dependencies {
7979

8080
task copySecretKey(type: Copy) {
8181
// Search GOOGLE_APPLICATION_CREDENTIALS on internet and ADD the Env Variable on your Machine.
82-
def File secretKey = file "$System.env.GOOGLE_APPLICATION_CREDENTIALS"
82+
File secretKey = file "$System.env.GOOGLE_APPLICATION_CREDENTIALS"
83+
if (project.ext.isCi || !secretKey.exists()) {
84+
secretKey = File.createTempFile('temp', 'file')
85+
secretKey.deleteOnExit()
86+
}
8387
from secretKey.getParent()
8488
include secretKey.getName()
8589
into 'src/main/res/raw'

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-
#Thu Aug 09 14:31:45 BST 2018
2+
#Thu Aug 09 15:34:07 BST 2018
33
screen=0
44
major=00
55
sdk=0

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-
#Thu Aug 09 14:31:47 BST 2018
2+
#Thu Aug 09 15:34:56 BST 2018
33
screen=0
44
major=00
55
sdk=0

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-
#Thu Aug 09 14:31:48 BST 2018
2+
#Thu Aug 09 15:32:48 BST 2018
33
screen=0
44
major=00
55
sdk=0

0 commit comments

Comments
 (0)