Skip to content

Commit

Permalink
UPDATE: Upgrade version of support libraries to 27.1.1 and Google Pla…
Browse files Browse the repository at this point in the history
…y services to 15.0.2.

The minimal version enforced by Google Play policies.
  • Loading branch information
oasisfeng committed Jul 17, 2018
1 parent fcc270d commit 21751d0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.feature'

android {
compileSdkVersion 28
compileSdkVersion 27

defaultConfig {
minSdkVersion 21
Expand Down Expand Up @@ -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' }
}
4 changes: 2 additions & 2 deletions assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'io.fabric'

android {
compileSdkVersion 28
compileSdkVersion 27

defaultConfig {
applicationId "com.oasisfeng.island"
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +23,6 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://maven.fabric.io/public' }
}
}

Expand Down
4 changes: 2 additions & 2 deletions engine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
4 changes: 2 additions & 2 deletions fileprovider/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
16 changes: 8 additions & 8 deletions shared/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.feature'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
minSdkVersion 21
Expand Down Expand Up @@ -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'
}

0 comments on commit 21751d0

Please sign in to comment.