From 478a790d0024dd10e148a55879bfb9571ec354b3 Mon Sep 17 00:00:00 2001
From: Lennart Goedhart <lennart@omnibase.com.au>
Date: Sat, 1 Jul 2017 20:31:45 +0800
Subject: [PATCH] Update gradle and plugins.
---
app/build.gradle | 4 ++--
.../info/nightscout/android/medtronic/MainActivity.java | 7 +++----
app/src/main/res/layout/activity_main.xml | 1 -
build.gradle | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index f2e7efc..0da5ebe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,12 +8,12 @@ buildscript {
dependencies {
classpath 'io.fabric.tools:gradle:1.21.6'
- classpath 'io.realm:realm-gradle-plugin:3.1.2'
+ classpath 'io.realm:realm-gradle-plugin:3.4.0'
classpath 'org.ajoberstar:grgit:1.5.0'
}
}
plugins {
- id 'net.researchgate.release' version '2.4.0'
+ id 'net.researchgate.release' version '2.6.0'
}
apply plugin: 'com.android.application'
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
index 92c67dc..a87d924 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
private void checkForUpdateNow() {
new AppUpdater(this)
.setUpdateFrom(UpdateFrom.JSON)
- .setUpdateXML("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json")
+ .setUpdateJSON("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json")
.showAppUpdated(true) // Show a dialog, even if there isn't an update
.start();
}
@@ -445,7 +445,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
private void checkForUpdateBackground(int checkEvery) {
new AppUpdater(this)
.setUpdateFrom(UpdateFrom.JSON)
- .setUpdateXML("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json")
+ .setUpdateJSON("https://raw.githubusercontent.com/pazaan/600SeriesAndroidUploader/master/app/update.json")
.showEvery(checkEvery) // Only check for an update every `checkEvery` invocations
.start();
}
@@ -771,7 +771,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
String sgvString;
if (pumpStatusData.isCgmActive()) {
sgvString = MainActivity.strFormatSGV(pumpStatusData.getSgv());
- ;
if (configurationStore.isMmolxl()) {
Log.d(TAG, sgvString + " mmol/L");
} else {
@@ -782,7 +781,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
}
textViewBg.setText(sgvString);
- textViewBgTime.setText(DateUtils.getRelativeTimeSpanString(pumpStatusData.getEventDate().getTime()));
+ textViewBgTime.setText(DateUtils.getRelativeTimeSpanString(pumpStatusData.getSgvDate().getTime()));
textViewTrend.setText(MainActivity.renderTrendSymbol(pumpStatusData.getCgmTrend()));
textViewIOB.setText(String.format(Locale.getDefault(), "%.2f", pumpStatusData.getActiveInsulin()));
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8ed60ee..9810c1a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -134,7 +134,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- android:gravity="bottom"
<TextView
android:id="@+id/textview_log"
diff --git a/build.gradle b/build.gradle
index 9293e06..958eeb2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.1'
+ classpath 'com.android.tools.build:gradle:2.3.3'
}
}
--
GitLab