Skip to content

Commit 6d18c81

Browse files
author
sds100
committed
build.gradle: merge
1 parent a3b2056 commit 6d18c81

File tree

1 file changed

+51
-8
lines changed

1 file changed

+51
-8
lines changed

app/build.gradle

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ apply plugin: 'kotlin-android-extensions'
55
apply plugin: 'io.fabric'
66

77
android {
8-
compileSdkVersion 28
9-
buildToolsVersion = '28.0.3'
8+
compileSdkVersion 29
9+
buildToolsVersion = '29.0.1'
10+
11+
compileOptions {
12+
sourceCompatibility JavaVersion.VERSION_1_8
13+
targetCompatibility JavaVersion.VERSION_1_8
14+
}
1015

1116
defaultConfig {
1217
applicationId "io.github.sds100.keymapper"
@@ -26,6 +31,42 @@ android {
2631
applicationIdSuffix ".debug"
2732
versionNameSuffix "-debug"
2833
}
34+
ci {
35+
debuggable = true
36+
37+
def versionPropsFile = file('version.properties')
38+
int versionBuild = 0
39+
40+
//increment the versionBuild
41+
task("autoIncrementBuildNumber") {
42+
if (versionPropsFile.canRead()) {
43+
Properties versionProps = new Properties()
44+
versionProps.load(new FileInputStream(versionPropsFile))
45+
46+
//if the version name has changed, reset the build version counter
47+
if (versionProps['VERSION_NAME'].toString() != android.defaultConfig.versionName) {
48+
versionBuild = 0
49+
} else {
50+
versionBuild = versionProps['CI_BUILD'].toInteger()
51+
}
52+
53+
versionBuild = versionProps['CI_BUILD'].toInteger() + 1
54+
versionProps['CI_BUILD'] = versionBuild.toString()
55+
versionProps['VERSION_NAME'] = android.defaultConfig.versionName
56+
versionProps.store(versionPropsFile.newWriter(), null)
57+
} else {
58+
throw new FileNotFoundException("Could not read version.properties!")
59+
}
60+
}
61+
62+
applicationIdSuffix ".ci"
63+
versionNameSuffix "." + versionBuild + "-ci"
64+
signingConfig signingConfigs.debug
65+
}
66+
}
67+
68+
dataBinding {
69+
enabled = true
2970
}
3071
}
3172

@@ -36,23 +77,25 @@ dependencies {
3677
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3778
implementation "org.jetbrains.anko:anko-commons:$anko_version"
3879

39-
implementation 'com.google.android.material:material:1.1.0-alpha04'
80+
implementation 'com.google.android.material:material:1.1.0-alpha08'
4081
implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
4182
implementation 'com.hannesdorfmann:adapterdelegates4:4.0.0'
4283
implementation 'com.github.mukeshsolanki:MarkdownView-Android:1.0.8'
4384
implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
85+
implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
86+
implementation 'com.heinrichreimersoftware:material-intro:master-SNAPSHOT'
4487

45-
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
88+
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
4689
implementation 'androidx.core:core-ktx:1.0.2'
4790
implementation 'androidx.fragment:fragment-ktx:1.0.0'
48-
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha05'
49-
implementation 'androidx.preference:preference:1.1.0-alpha05'
91+
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01'
92+
implementation 'androidx.preference:preference:1.1.0-rc01'
5093
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5194
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
5295
implementation "androidx.room:room-runtime:$room_version"
5396

54-
implementation 'com.google.firebase:firebase-core:16.0.9'
55-
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0'
97+
implementation 'com.google.firebase:firebase-core:17.0.1'
98+
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
5699

57100
kapt "android.arch.lifecycle:compiler:1.1.1"
58101
kapt "androidx.room:room-compiler:$room_version"

0 commit comments

Comments
 (0)