diff --git a/app/build.gradle b/app/build.gradle index 08ff2fada5..7bb8512ed1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ buildscript { } } apply plugin: "com.android.application" +apply plugin: 'com.google.gms.google-services' apply plugin: "io.fabric" apply plugin: "jacoco-android" apply plugin: 'com.jakewharton.butterknife' @@ -167,12 +168,11 @@ 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.8' implementation("com.crashlytics.sdk.android:crashlytics:2.9.9@aar") { transitive = true; } - implementation("com.crashlytics.sdk.android:answers:1.4.7@aar") { - transitive = true; - } libs "MilosKozak:danars-support-lib:master@zip" implementation "com.android.support:appcompat-v7:${supportLibraryVersion}" @@ -192,9 +192,9 @@ dependencies { } implementation "org.apache.commons:commons-lang3:3.7" implementation "org.slf4j:slf4j-api:1.7.21" + // Graphview cannot be upgraded implementation "com.jjoe64:graphview:4.0.1" implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1" - implementation 'com.google.android.gms:play-services-wearable:10.2.1' implementation(name: "android-edittext-validator-v1.3.4-mod", ext: "aar") implementation(name: "sightparser-release", ext: "aar") implementation 'com.madgag.spongycastle:core:1.58.0.0' diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000000..42db6f4289 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,107 @@ +{ + "project_info": { + "project_number": "477603612366", + "firebase_url": "https://androidaps-c34f8.firebaseio.com", + "project_id": "androidaps-c34f8", + "storage_bucket": "androidaps-c34f8.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:aef229914e3e5448", + "android_client_info": { + "package_name": "info.nightscout.aapspumpcontrol" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:efc956f55b281623", + "android_client_info": { + "package_name": "info.nightscout.androidaps" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:b38d6e7351f73cc0", + "android_client_info": { + "package_name": "info.nightscout.nsclient" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:2dc8cf3acd3332e7", + "android_client_info": { + "package_name": "info.nightscout.nsclient2" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index afaa631c48..57745d34ab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,12 @@ buildscript { google() jcenter() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url 'https://maven.fabric.io/public' } } dependencies { classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.google.gms:google-services:4.2.0' + classpath 'io.fabric.tools:gradle:1.28.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/wear/build.gradle b/wear/build.gradle index 2a35c591b6..9f094935fd 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' ext { wearableVersion = "2.0.1" - playServicesWearable = "10.2.1" + playServicesWearable = "16.0.1" } def generateGitBuild = { ->