From 83f4e46d32dda29a3a8d2976697f410576f6d58f Mon Sep 17 00:00:00 2001
From: Lennart Goedhart <lennart@omnibase.com.au>
Date: Sat, 15 Apr 2017 13:34:16 +1000
Subject: [PATCH] =?UTF-8?q?Remove=20files=20from=20Git=20that=20shouldn?=
=?UTF-8?q?=E2=80=99t=20be=20in=20source=20control=20Upgrade=20to=20Gradle?=
=?UTF-8?q?=203.3,=20Build=20Tools=2025.0.2,=20Realm=203.1.2=20Remove=20du?=
=?UTF-8?q?plicate=20MedtronicCnlAlarmReceiver=20Fix=20crash=20when=20view?=
=?UTF-8?q?ing=20Registered=20Devices=20after=20package=20updates.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 37 +++++++++----------
app/src/main/AndroidManifest.xml | 5 ---
.../android/medtronic/ManageCNLActivity.java | 2 +-
build.gradle | 5 +--
gradle/wrapper/gradle-wrapper.properties | 4 +-
5 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 6bfea65..324b0c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,17 +2,18 @@ import org.ajoberstar.grgit.Grgit
buildscript {
repositories {
+ jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'io.fabric.tools:gradle:1.21.6'
- classpath 'io.realm:realm-gradle-plugin:2.3.1'
+ classpath 'io.realm:realm-gradle-plugin:3.1.2'
classpath 'org.ajoberstar:grgit:1.5.0'
}
}
plugins {
- id 'net.researchgate.release' version '2.3.4'
+ id 'net.researchgate.release' version '2.4.0'
}
apply plugin: 'com.android.application'
@@ -48,15 +49,15 @@ def gitBranch() {
return ext.repo.branch.current.name
}
-def getBugfenderApiKey() {
+static def getBugfenderApiKey() {
Properties properties = new Properties()
properties.load(new FileInputStream("app/bugfender.properties"))
return "\"" + properties.getProperty("apiKey", "") + "\""
}
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.3"
+ compileSdkVersion 25
+ buildToolsVersion '25.0.2'
// FIXME - replace with URLConnection. This is used in ManageCNLActivity.
useLibrary 'org.apache.http.legacy'
@@ -67,7 +68,7 @@ android {
defaultConfig {
applicationId "info.nightscout.android"
minSdkVersion 14
- targetSdkVersion 23
+ targetSdkVersion 25
versionName project.properties['version'] + "/" + gitCommitId() // + " (" + gitBranch()+")"
versionCode gitVersion()
buildConfigField "String", "BUGFENDER_API_KEY", getBugfenderApiKey()
@@ -116,7 +117,7 @@ task signRelease << {
task zipalignRelease << {
def command = [
- '/Users/lennart/Library/Android/sdk/build-tools/23.0.3/zipalign',
+ '/Users/lennart/Library/Android/sdk/build-tools/25.0.2/zipalign',
'-v',
'4',
'app/build/outputs/apk/app-release-unsigned.apk',
@@ -145,26 +146,24 @@ release {
dependencies {
compile files('libs/slf4j-api-1.7.2.jar')
- compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
- transitive = true;
- }
- compile('com.mikepenz:materialdrawer:5.2.9@aar') {
- transitive = true
- }
- compile 'com.android.support:appcompat-v7:23.4.0'
+
+ compile 'com.android.support:support-v13:25.3.1'
+ compile 'com.android.support:design:25.3.1'
+ compile 'com.android.support:appcompat-v7:25.3.1'
compile 'org.apache.commons:commons-lang3:3.4'
compile 'com.mikepenz:google-material-typeface:2.2.0.1.original@aar'
compile 'uk.co.chrisjenx:calligraphy:2.2.0'
compile 'com.bugfender.sdk:android:0.7.2'
compile 'com.jjoe64:graphview:4.2.1'
- compile 'com.android.support:support-v4:23.4.0'
compile 'com.google.code.gson:gson:2.7'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.okhttp3:okhttp:3.3.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
- compile 'com.google.android.gms:play-services-appindexing:8.4.0'
-
-
-
+ compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+ transitive = true;
+ }
+ compile('com.mikepenz:materialdrawer:5.2.9@aar') {
+ transitive = true
+ }
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 82d3049..3e5115f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,11 +84,6 @@
<receiver android:name=".upload.nightscout.NightscoutUploadReceiver" />
<receiver android:name=".xdrip_plus.XDripPlusUploadReceiver" />
-
- <receiver android:name=".medtronic.service.MedtronicCnlAlarmReceiver"></receiver>
-
-
-
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/android/medtronic/ManageCNLActivity.java b/app/src/main/java/info/nightscout/android/medtronic/ManageCNLActivity.java
index b995c0d..095b812 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/ManageCNLActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/ManageCNLActivity.java
@@ -66,9 +66,9 @@ public class ManageCNLActivity extends AppCompatActivity {
//handle listview and assign adapter
ListView lView = (ListView) findViewById(R.id.cnl_list);
- lView.setAdapter(adapter);
lView.addHeaderView(getLayoutInflater().inflate(R.layout.manage_cnl_listview_header, null));
lView.setEmptyView(findViewById(R.id.manage_cnl_listview_empty)); //getLayoutInflater().inflate(R.layout.manage_cnl_listview_empty, null));
+ lView.setAdapter(adapter);
}
@Override
diff --git a/build.gradle b/build.gradle
index fa34379..9293e06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- classpath 'io.realm:realm-gradle-plugin:2.2.2'
+ classpath 'com.android.tools.build:gradle:2.3.1'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3d5435e..8e8e198 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 12 11:44:13 AEDT 2016
+#Tue Mar 28 09:13:19 AEDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
--
GitLab