Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Change-Id: If040cec52beb1f0645ef55a3f2d13e8383427aa9
  • Loading branch information
samtstern committed Sep 28, 2017
1 parent f64f236 commit bc29d82
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 31 deletions.
26 changes: 10 additions & 16 deletions firestore/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,27 @@ android {
}

dependencies {
def play_version = '11.3.0'
def support_version = '26.0.0'

// Firestore
compile "com.google.firebase:firebase-firestore:${play_version}"
compile "com.google.firebase:firebase-firestore:11.4.2"

// Other Firebase/Play services deps
compile "com.google.firebase:firebase-auth:${play_version}"
compile "com.google.android.gms:play-services-auth:${play_version}"
compile "com.google.firebase:firebase-auth:11.4.2"
compile "com.google.android.gms:play-services-auth:11.4.2"

// FirebaseUI (for authentication)
compile ('com.firebaseui:firebase-ui-auth:2.3.0') {
exclude group: 'com.google.firebase', module: 'firebase-auth'
exclude group: 'com.google.android.gms', module: 'play-services-auth'
}
compile 'com.firebaseui:firebase-ui-auth:2.3.0'

// ButterKnife (for sample code brevity)
compile 'com.jakewharton:butterknife:8.7.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'

// Support Libs
compile "com.android.support:appcompat-v7:${support_version}"
compile "com.android.support:animated-vector-drawable:${support_version}"
compile "com.android.support:cardview-v7:${support_version}"
compile "com.android.support:customtabs:${support_version}"
compile "com.android.support:design:${support_version}"
compile "com.android.support:recyclerview-v7:${support_version}"
compile "com.android.support:appcompat-v7:26.0.0"
compile "com.android.support:animated-vector-drawable:26.0.0"
compile "com.android.support:cardview-v7:26.0.0"
compile "com.android.support:customtabs:26.0.0"
compile "com.android.support:design:26.0.0"
compile "com.android.support:recyclerview-v7:26.0.0"

// Android architecture components
compile "android.arch.lifecycle:runtime:1.0.0-alpha9"
Expand Down
15 changes: 0 additions & 15 deletions firestore/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,5 @@
# hide the original source file name.
#-renamesourcefileattribute SourceFile

# See:
# https://github.com/grpc/grpc-java/issues/2207
-keep class io.grpc.internal.DnsNameResolverProvider
-keep class io.grpc.okhttp.OkHttpChannelProvider

# Keep custom model classes
-keep class com.google.firebase.example.fireeats.model.** { *; }

## Android architecture components: ViewModel
-keepclassmembers class * extends android.arch.lifecycle.ViewModel {
<init>(...);
}

## Android architecture components: Lifecycle
-keepclasseswithmembers class * implements android.arch.lifecycle.GenericLifecycleObserver {
<init>(...);
}

0 comments on commit bc29d82

Please sign in to comment.