From 21751d06d8229afdd625bede90b897d929b9f029 Mon Sep 17 00:00:00 2001 From: oasisfeng Date: Tue, 17 Jul 2018 22:35:39 +0800 Subject: [PATCH] UPDATE: Upgrade version of support libraries to 27.1.1 and Google Play services to 15.0.2. The minimal version enforced by Google Play policies. --- app/build.gradle | 4 ++-- assembly/build.gradle | 4 ++-- build.gradle | 5 ++--- engine/build.gradle | 4 ++-- fileprovider/build.gradle | 4 ++-- shared/build.gradle | 16 ++++++++-------- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 257677a0a..290abd5c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.feature' android { - compileSdkVersion 28 + compileSdkVersion 27 defaultConfig { minSdkVersion 21 @@ -47,5 +47,5 @@ dependencies { api(name: 'setup-wizard-lib-platform-release', ext: 'aar') androidTestImplementation 'org.mockito:mockito-android:2.8.9' - androidTestImplementation('com.android.support.test:runner:0.5') { exclude group: 'com.android.support', module: 'support-annotations' } + androidTestImplementation('com.android.support.test:runner:1.0.2') { exclude group: 'com.android.support', module: 'support-annotations' } } diff --git a/assembly/build.gradle b/assembly/build.gradle index e3c946a78..10943f1ed 100644 --- a/assembly/build.gradle +++ b/assembly/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' apply plugin: 'io.fabric' android { - compileSdkVersion 28 + compileSdkVersion 27 defaultConfig { applicationId "com.oasisfeng.island" @@ -82,7 +82,7 @@ dependencies { fullImplementation project(':fileprovider') implementation 'com.android.support:support-v4:27.1.1' // To workaround the dependency conflict caused by "com.android.databinding:library" - implementation 'com.google.firebase:firebase-analytics:11.8.0' // To workaround the dependency conflict caused by "com.google.gms.google-services" + implementation 'com.google.firebase:firebase-analytics:15.0.2' // To workaround the dependency conflict caused by "com.google.gms.google-services" } // Firebase plug-in diff --git a/build.gradle b/build.gradle index c9ad00131..d8469a476 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.3' - classpath 'com.google.gms:google-services:3.1.2' - classpath 'io.fabric.tools:gradle:1.25.1' + classpath 'com.google.gms:google-services:4.0.2' + classpath 'io.fabric.tools:gradle:1.25.4' classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' // NOTE: Do not place your application dependencies here; they belong @@ -23,7 +23,6 @@ allprojects { repositories { jcenter() google() - maven { url 'https://maven.fabric.io/public' } } } diff --git a/engine/build.gradle b/engine/build.gradle index b537299ef..2416253c2 100644 --- a/engine/build.gradle +++ b/engine/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation project(':shared') - implementation 'com.android.support:support-compat:27.0.2' // ShortcutShuttle + implementation 'com.android.support:support-compat:27.1.1' // ShortcutShuttle - androidTestImplementation('com.android.support.test:runner:0.5') { exclude group: 'com.android.support', module: 'support-annotations' } + androidTestImplementation('com.android.support.test:runner:1.0.2') { exclude group: 'com.android.support', module: 'support-annotations' } } diff --git a/fileprovider/build.gradle b/fileprovider/build.gradle index 79fb4b704..76883f329 100644 --- a/fileprovider/build.gradle +++ b/fileprovider/build.gradle @@ -25,8 +25,8 @@ android.libraryVariants.all { variant -> dependencies { implementation project(':shared') - implementation 'com.android.support:support-annotations:27.0.2' + implementation 'com.android.support:support-annotations:27.1.1' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.2' } diff --git a/shared/build.gradle b/shared/build.gradle index e9472b11b..0c5fd9aa5 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.feature' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 @@ -40,18 +40,18 @@ dependencies { api 'com.google.code.findbugs:jsr305:3.0.1' api 'net.sourceforge.streamsupport:android-retrostreams:1.6.3' api 'net.sourceforge.streamsupport:android-retrofuture:1.6.3' - api 'com.android.support:support-annotations:27.0.2' + api 'com.android.support:support-annotations:27.1.1' implementation 'org.jetbrains:annotations:15.0' - implementation 'com.google.android.gms:play-services-analytics:11.8.0' - implementation 'com.google.firebase:firebase-analytics:11.8.0' - implementation 'com.google.firebase:firebase-config:11.8.0' - api('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { transitive = true } + implementation 'com.google.android.gms:play-services-analytics:15.0.2' + implementation 'com.google.firebase:firebase-analytics:15.0.2' + implementation 'com.google.firebase:firebase-config:15.0.2' + api 'com.crashlytics.sdk.android:crashlytics:2.9.4' implementation 'com.oasisfeng.condom:library:2.2.0' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.8.9' androidTestImplementation 'junit:junit:4.12' - androidTestImplementation('com.android.support.test:runner:0.5') { exclude group: 'com.android.support', module: 'support-annotations' } - androidTestImplementation 'com.android.support.test:rules:1.0.1' + androidTestImplementation('com.android.support.test:runner:1.0.2') { exclude group: 'com.android.support', module: 'support-annotations' } + androidTestImplementation 'com.android.support.test:rules:1.0.2' }