From c3bec7e7a6d273b5520dd0f2d266c3bc9bb76b8b Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Wed, 4 Apr 2018 21:38:44 +0200 Subject: [PATCH 1/4] Revert targetSdkVersion --- app/build.gradle | 8 +++----- wear/build.gradle | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 080422af46..d6119e8874 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'com.jakewharton.butterknife' ext { supportLibraryVersion = "27.0.2" - sdkBuildVersion = "27.0.3" ormLiteVersion = "4.46" powermockVersion = "1.7.3" dexmakerVersion = "1.2" @@ -56,13 +55,12 @@ tasks.matching {it instanceof Test}.all { } android { - compileSdkVersion 27 - buildToolsVersion "${sdkBuildVersion}" + compileSdkVersion 26 defaultConfig { applicationId "info.nightscout.androidaps" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 25 multiDexEnabled true versionCode 1500 version "1.60c-dev" @@ -78,7 +76,7 @@ android { // TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0 // has been upgraded (requiring significant code changes), which currently fails release // build with a deprecation warning - // abortOnError false + abortOnError false // (disabled entirely to avoid reports on the error, which would still be displayed // and it's easy to overlook that it's ignored) checkReleaseBuilds false diff --git a/wear/build.gradle b/wear/build.gradle index e842aae62f..7d8863fe33 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.application' ext { - supportLibraryVersion = "23.0.1" - wearableVersion = "2.0.1" + wearableVersion = "2.0.1" } def generateGitBuild = { -> @@ -28,12 +27,11 @@ def generateGitBuild = { -> android { compileSdkVersion 23 - buildToolsVersion "27.0.3" defaultConfig { applicationId "info.nightscout.androidaps" - minSdkVersion 20 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 25 versionCode 1 versionName "1.0.2" buildConfigField "String", "BUILDVERSION", generateGitBuild() From b7840fb5b5031731c3a4b03e64f3361f06273651 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Wed, 4 Apr 2018 21:44:23 +0200 Subject: [PATCH 2/4] Revert compileSdkVersion as well --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d6119e8874..a6a1c2434d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,7 @@ tasks.matching {it instanceof Test}.all { } android { - compileSdkVersion 26 + compileSdkVersion 25 defaultConfig { applicationId "info.nightscout.androidaps" From 3e792ebfe3e3f584e225e4dd0ffb30f52e1087f0 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Wed, 4 Apr 2018 21:53:37 +0200 Subject: [PATCH 3/4] Downgrade supportLibVersion --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a6a1c2434d..99aeb35dd1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ apply plugin: "jacoco-android" apply plugin: 'com.jakewharton.butterknife' ext { - supportLibraryVersion = "27.0.2" + supportLibraryVersion = "25.4.0" ormLiteVersion = "4.46" powermockVersion = "1.7.3" dexmakerVersion = "1.2" From 79094a92f9b7bad89d85fe64cec7795f35ed3d35 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Wed, 4 Apr 2018 22:46:44 +0200 Subject: [PATCH 4/4] Provide newer support libraries, compile with 27 and target 25 --- app/build.gradle | 6 +++--- build.gradle | 2 +- wear/build.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 99aeb35dd1..72af0a8020 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ apply plugin: "jacoco-android" apply plugin: 'com.jakewharton.butterknife' ext { - supportLibraryVersion = "25.4.0" + supportLibraryVersion = "27.1.0" ormLiteVersion = "4.46" powermockVersion = "1.7.3" dexmakerVersion = "1.2" @@ -55,7 +55,7 @@ tasks.matching {it instanceof Test}.all { } android { - compileSdkVersion 25 + compileSdkVersion 27 defaultConfig { applicationId "info.nightscout.androidaps" @@ -181,7 +181,7 @@ dependencies { implementation("com.crashlytics.sdk.android:answers:1.3.12@aar") { transitive = true; } - libs 'MilosKozak:danars-support-lib:master@zip' + libs "MilosKozak:danars-support-lib:master@zip" implementation "com.android.support:appcompat-v7:${supportLibraryVersion}" implementation "com.android.support:support-v4:${supportLibraryVersion}" diff --git a/build.gradle b/build.gradle index 7cfd0f7ea4..b958e8ab96 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { allprojects { repositories { - jcenter() google() + jcenter() maven { url "https://maven.google.com" diff --git a/wear/build.gradle b/wear/build.gradle index 7d8863fe33..aef05d79c4 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -26,7 +26,7 @@ def generateGitBuild = { -> } android { - compileSdkVersion 23 + compileSdkVersion 27 defaultConfig { applicationId "info.nightscout.androidaps"