From 29af8d68266302bd84e1a521b1fc3fb30f0a5297 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Tue, 7 Nov 2017 09:39:33 +0100 Subject: [PATCH] Adding dfu packet to proguard rules Fixes DFU FILE ERROR (parsing manifest failed as the required classes were removed) --- app/build.gradle | 4 ++-- app/proguard-rules.pro | 6 +++++- wear/build.gradle | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4285066e..98bb79bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 18 targetSdkVersion 26 - versionCode 62 - versionName "2.5.0" + versionCode 63 + versionName "2.5.1" resConfigs "en" } buildTypes { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a285616b..ef503463 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -89,4 +89,8 @@ -dontnote org.apache.http.params.** -dontnote org.apache.http.conn.scheme.** -dontnote org.apache.http.conn.** --dontnote android.net.http.** \ No newline at end of file +-dontnote android.net.http.** + +# DFU Library +-keep class no.nordicsemi.android.dfu.** { *; } + diff --git a/wear/build.gradle b/wear/build.gradle index 8ccc2343..cf7d6315 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -10,8 +10,8 @@ android { applicationId "no.nordicsemi.android.nrftoolbox" minSdkVersion 23 targetSdkVersion 26 - versionCode 262506201 // target: 26, version: 2.5.0, build: 62, multi-APK: 01 - versionName "2.5.0" + versionCode 262516201 // target: 26, version: 2.5.1, build: 62, multi-APK: 01 + versionName "2.5.1" resConfigs "en" } lintOptions {