diff options
author | pacien | 2019-10-13 01:09:17 +0200 |
---|---|---|
committer | pacien | 2019-10-13 01:09:17 +0200 |
commit | c25f024320abf58d0831f10fa877f6a58635cd53 (patch) | |
tree | 4ca3b5dca47ccb8eb23aa37b8163117310e48b56 /app/build.gradle | |
parent | 2c566d2bf3c3f4663426cc9bb0d3917e5989635b (diff) | |
download | tincapp-c25f024320abf58d0831f10fa877f6a58635cd53.tar.gz |
target sdk 28
switching from android.support to androidx
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/app/build.gradle b/app/build.gradle index 4fc04ae..5ef4f4a 100644 --- a/app/build.gradle +++ b/app/build.gradle | |||
@@ -30,13 +30,12 @@ def keystoreProperties = new Properties() | |||
30 | if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) | 30 | if (keystoreAvailable) keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) |
31 | 31 | ||
32 | android { | 32 | android { |
33 | compileSdkVersion 27 | 33 | compileSdkVersion 29 |
34 | 34 | ||
35 | defaultConfig { | 35 | defaultConfig { |
36 | applicationId 'org.pacien.tincapp' | 36 | applicationId 'org.pacien.tincapp' |
37 | minSdkVersion 21 | 37 | minSdkVersion 21 |
38 | //noinspection OldTargetApi | 38 | targetSdkVersion 28 // FIXME: bad file descriptor in daemon when targeting 29 |
39 | targetSdkVersion 27 | ||
40 | multiDexEnabled true | 39 | multiDexEnabled true |
41 | versionCode 28 | 40 | versionCode 28 |
42 | versionName '0.28' | 41 | versionName '0.28' |
@@ -78,17 +77,17 @@ dependencies { | |||
78 | 77 | ||
79 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | 78 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
80 | implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' | 79 | implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' |
81 | implementation 'android.arch.lifecycle:extensions:1.1.1' | 80 | implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' |
82 | implementation 'com.android.support:support-compat:27.1.1' | 81 | implementation 'androidx.core:core:1.1.0' |
83 | implementation 'com.android.support:design:27.1.1' | 82 | implementation 'com.google.android.material:material:1.0.0' |
84 | implementation 'com.journeyapps:zxing-android-embedded:3.6.0' | 83 | implementation 'com.journeyapps:zxing-android-embedded:3.6.0' |
85 | implementation 'org.bouncycastle:bcpkix-jdk15on:1.61' | 84 | implementation 'org.bouncycastle:bcpkix-jdk15on:1.61' |
86 | implementation 'org.slf4j:slf4j-api:1.7.26' | 85 | implementation 'org.slf4j:slf4j-api:1.7.26' |
87 | implementation 'com.github.tony19:logback-android:2.0.0' | 86 | implementation 'com.github.tony19:logback-android:2.0.0' |
88 | // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 | 87 | // commons-configuration2:2.4 requires support for interface default methods, not available on SDK <24 |
89 | implementation('org.apache.commons:commons-configuration2:2.3') { exclude group: 'commons-logging', module: 'commons-logging' } | 88 | implementation 'org.apache.commons:commons-configuration2:2.3' |
90 | implementation('commons-beanutils:commons-beanutils:1.9.3') { exclude group: 'commons-logging', module: 'commons-logging' } | 89 | implementation 'commons-beanutils:commons-beanutils:1.9.3' |
91 | implementation('commons-io:commons-io:2.6') { exclude group: 'commons-logging', module: 'commons-logging' } | 90 | implementation 'commons-io:commons-io:2.6' |
92 | } | 91 | } |
93 | 92 | ||
94 | repositories { | 93 | repositories { |