caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #836 from triplem/gradle_update

Browse source 
Revert targetSdkVersion
This commit is contained in:
Milos Kozak 2018-04-04 23:18:47 +02:00 committed by GitHub
commit f75f4ef400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle
View file

@ -15,8 +15,7 @@ apply plugin: "jacoco-android"
apply plugin: 'com.jakewharton.butterknife' apply plugin: 'com.jakewharton.butterknife'
ext { ext {
supportLibraryVersion = "27.0.2" supportLibraryVersion = "27.1.0"
sdkBuildVersion = "27.0.3"
ormLiteVersion = "4.46" ormLiteVersion = "4.46"
powermockVersion = "1.7.3" powermockVersion = "1.7.3"
dexmakerVersion = "1.2" dexmakerVersion = "1.2"
@ -57,12 +56,11 @@ tasks.matching {it instanceof Test}.all {
android { android {
compileSdkVersion 27 compileSdkVersion 27
buildToolsVersion "${sdkBuildVersion}"
defaultConfig { defaultConfig {
applicationId "info.nightscout.androidaps" applicationId "info.nightscout.androidaps"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 27 targetSdkVersion 25
multiDexEnabled true multiDexEnabled true
versionCode 1500 versionCode 1500
version "1.60c-dev" version "1.60c-dev"
@ -78,7 +76,7 @@ android {
// TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0 // 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 // has been upgraded (requiring significant code changes), which currently fails release
// build with a deprecation warning // build with a deprecation warning
// abortOnError false abortOnError false
// (disabled entirely to avoid reports on the error, which would still be displayed // (disabled entirely to avoid reports on the error, which would still be displayed
// and it's easy to overlook that it's ignored) // and it's easy to overlook that it's ignored)
checkReleaseBuilds false checkReleaseBuilds false
@ -183,7 +181,7 @@ dependencies {
implementation("com.crashlytics.sdk.android:answers:1.3.12@aar") { implementation("com.crashlytics.sdk.android:answers:1.3.12@aar") {
transitive = true; 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:appcompat-v7:${supportLibraryVersion}"
implementation "com.android.support:support-v4:${supportLibraryVersion}" implementation "com.android.support:support-v4:${supportLibraryVersion}"

2
build.gradle
View file

@ -18,8 +18,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter()
google() google()
jcenter()
maven { maven {
url "https://maven.google.com" url "https://maven.google.com"

10
wear/build.gradle
View file

@ -1,8 +1,7 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
ext { ext {
supportLibraryVersion = "23.0.1" wearableVersion = "2.0.1"
wearableVersion = "2.0.1"
} }
def generateGitBuild = { -> def generateGitBuild = { ->
@ -27,13 +26,12 @@ def generateGitBuild = { ->
} }
android { android {
compileSdkVersion 23 compileSdkVersion 27
buildToolsVersion "27.0.3"
defaultConfig { defaultConfig {
applicationId "info.nightscout.androidaps" applicationId "info.nightscout.androidaps"
minSdkVersion 20 minSdkVersion 21
targetSdkVersion 23 targetSdkVersion 25
versionCode 1 versionCode 1
versionName "1.0.2" versionName "1.0.2"
buildConfigField "String", "BUILDVERSION", generateGitBuild() buildConfigField "String", "BUILDVERSION", generateGitBuild()