diff --git a/app/build.gradle b/app/build.gradle index 3a164826..9415f1d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 - buildToolsVersion "29.0.0" + buildToolsVersion "29.0.2" defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" @@ -17,12 +17,10 @@ android { buildTypes { debug { minifyEnabled true - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { minifyEnabled true - useProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -42,15 +40,15 @@ dependencies { //noinspection GradleDependency implementation 'com.google.android.gms:play-services-wearable:10.2.0' - implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'androidx.preference:preference:1.1.0-rc01' - implementation 'com.google.android.material:material:1.1.0-alpha09' + implementation 'androidx.appcompat:appcompat:1.2.0-alpha01' + implementation 'androidx.preference:preference:1.1.0' + implementation 'com.google.android.material:material:1.2.0-alpha04' implementation 'no.nordicsemi.android:log:2.2.0' - implementation 'no.nordicsemi.android.support.v18:scanner:1.4.0' + implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3' // The DFU Library is imported automatically from jcenter: - implementation 'no.nordicsemi.android:dfu:1.9.0' + implementation 'no.nordicsemi.android:dfu:1.9.1' // if you desire to build the DFU Library, clone the // https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, // add it as a module into the project structure and uncomment the following line diff --git a/build.gradle b/build.gradle index cff4f9f3..785b7b23 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.5.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/common/build.gradle b/common/build.gradle index d4b05a21..94838ee7 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 18 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" resConfigs "en" @@ -16,12 +16,10 @@ android { buildTypes { debug { minifyEnabled true - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { minifyEnabled true - useProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index efe922ea..e74c0867 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 28 10:32:07 CEST 2018 +#Mon Jan 27 13:05:59 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/wear/build.gradle b/wear/build.gradle index d6104521..c4ea4304 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 23 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 282726903 // target: 28, version: 2.6.0, build: 68, multi-APK: 01 versionName "2.7.2" resConfigs "en" @@ -19,12 +19,10 @@ android { buildTypes { debug { minifyEnabled true - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { minifyEnabled true - useProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -39,12 +37,12 @@ configurations.all() { configuration -> exclude group: "org.apache.httpcomponent dependencies { implementation project(':common') - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' + implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01' implementation 'androidx.percentlayout:percentlayout:1.0.0' - implementation 'com.google.android.support:wearable:2.4.0' - compileOnly 'com.google.android.wearable:wearable:2.4.0' + implementation 'com.google.android.support:wearable:2.5.0' + compileOnly 'com.google.android.wearable:wearable:2.5.0' - implementation 'no.nordicsemi.android.support.v18:scanner:1.4.0' + implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3' // uncomment to enable the Wear UI Library // https://developer.android.com/training/wearables/ui/wear-ui-library.html