diff --git a/app/build.gradle b/app/build.gradle index 95f682c5..beaf94c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion '24.0.2' + buildToolsVersion '25.0.1' defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 18 targetSdkVersion 25 - versionCode 54 - versionName "2.1.1" + versionCode 55 + versionName "2.2.0" } buildTypes { release { @@ -32,9 +32,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.google.android.gms:play-services-wearable:9.2.0' - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:design:25.0.0' - compile 'no.nordicsemi.android.support.v18:scanner:0.2.0' + compile 'com.android.support:appcompat-v7:25.0.1' + compile 'com.android.support:design:25.0.1' + compile 'no.nordicsemi.android.support.v18:scanner:1.0.0' compile 'no.nordicsemi.android:log:2.0.0' compile('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' @@ -45,7 +45,7 @@ dependencies { wearApp project(':wear') // The DFU Library is imported automatically from jcenter. - compile 'no.nordicsemi.android:dfu:1.0.4' + compile 'no.nordicsemi.android:dfu:1.1.0' // If you want to make some changes in the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, // add it as a module in Project Structure and uncomment the following line: diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java index 75094aa3..ed9e62a1 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java @@ -689,7 +689,8 @@ public class DfuActivity extends AppCompatActivity implements LoaderCallbacks