From 4dd4408273b38d27542b599c426e1acfca3b40bc Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 13 Jul 2019 10:01:01 +0200 Subject: [PATCH 1/3] gradle update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 398f280881..5d8db15fe6 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + 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' From 606122bae0c17c12ccfe2b693d7e68133eef429e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 13 Jul 2019 10:09:57 +0200 Subject: [PATCH 2/3] fix kotlin warnings --- .../androidaps/plugins/source/SourceDexcomPlugin.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt index 2131d5e321..6119c07c37 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt @@ -1,6 +1,5 @@ package info.nightscout.androidaps.plugins.source -import android.Manifest import android.content.Intent import android.content.pm.PackageManager import android.os.Build @@ -33,9 +32,9 @@ object SourceDexcomPlugin : PluginBase(PluginDescription() private val log = LoggerFactory.getLogger(L.BGSOURCE) private val PACKAGE_NAMES = arrayOf("com.dexcom.cgm.region1.mgdl", "com.dexcom.cgm.region1.mmol", - "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol", - "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl", - "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol") + "com.dexcom.cgm.region2.mgdl", "com.dexcom.cgm.region2.mmol", + "com.dexcom.g6.region1.mmol", "com.dexcom.g6.region2.mgdl", + "com.dexcom.g6.region3.mgdl", "com.dexcom.g6.region3.mmol") const val PERMISSION = "com.dexcom.cgm.EXTERNAL_PERMISSION" @@ -83,7 +82,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription() val meters = intent.getBundleExtra("meters") for (i in 0 until meters.size()) { val meter = meters.getBundle(i.toString()) - val timestamp = meter.getLong("timestamp") * 1000 + val timestamp = meter!!.getLong("timestamp") * 1000 if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue val jsonObject = JSONObject() jsonObject.put("enteredBy", "AndroidAPS-Dexcom") @@ -95,7 +94,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription() NSUpload.uploadCareportalEntryToNS(jsonObject) } if (SP.getBoolean(R.string.key_dexcom_lognssensorchange, false) && intent.hasExtra("sensorInsertionTime")) { - val sensorInsertionTime = intent.extras.getLong("sensorInsertionTime") * 1000 + val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000 if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) { val jsonObject = JSONObject() jsonObject.put("enteredBy", "AndroidAPS-Dexcom") @@ -104,7 +103,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription() NSUpload.uploadCareportalEntryToNS(jsonObject) } } - } catch (e : Exception) { + } catch (e: Exception) { log.error("Error while processing intent from Dexcom App", e) } } From adf1a0da6699bb90f22ad8641086b012ca8b6994 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 13 Jul 2019 16:16:43 +0200 Subject: [PATCH 3/3] libraries update --- app/build.gradle | 4 ++-- build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 086c5caa27..033a99de8a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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; } diff --git a/build.gradle b/build.gradle index 5d8db15fe6..571b6b73d3 100644 --- a/build.gradle +++ b/build.gradle @@ -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