Merge branch 'medtronic_andy_merge' of https://github.com/andyrozman/AndroidAPS into medtronic_andy_merge

This commit is contained in:
Andy Rozman 2019-07-13 19:22:07 +01:00
commit 92b9643b43
2 changed files with 5 additions and 5 deletions

View file

@ -222,8 +222,8 @@ dependencies {
wearApp project(':wear')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.android.gms:play-services-wearable:16.0.1'
implementation 'com.google.firebase:firebase-core:16.0.9'
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
implementation 'com.google.firebase:firebase-core:17.0.1'
implementation("com.crashlytics.sdk.android:crashlytics:2.9.9@aar") {
transitive = true;
}

View file

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.31'
ext.kotlin_version = '1.3.41'
ext.butterknifeVersion = '10.1.0'
repositories {
google()
@ -11,8 +11,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.29.0'
classpath 'com.google.gms:google-services:4.3.0'
classpath 'io.fabric.tools:gradle:1.30.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files