Merge branch 'master' into update-kotlin-coroutines-gradle

This commit is contained in:
arkon
2019-12-23 09:49:53 -05:00
committed by GitHub
54 changed files with 3006 additions and 1039 deletions

View File

@@ -30,7 +30,8 @@ ext {
android {
compileSdkVersion 27
buildToolsVersion '28.0.3'
buildToolsVersion '29.0.2'
publishNonDefault true
defaultConfig {
applicationId "eu.kanade.tachiyomi"
@@ -100,7 +101,7 @@ dependencies {
implementation 'com.github.inorichi:junrar-android:634c1f5'
// Android support library
final support_library_version = '27.0.2'
final support_library_version = '27.1.1'
implementation "com.android.support:support-v4:$support_library_version"
implementation "com.android.support:appcompat-v7:$support_library_version"
implementation "com.android.support:cardview-v7:$support_library_version"
@@ -110,7 +111,7 @@ dependencies {
implementation "com.android.support:support-annotations:$support_library_version"
implementation "com.android.support:customtabs:$support_library_version"
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:multidex:1.0.3'