From 0467fd9b4fa002f89f502efefe72e52ff114f3bd Mon Sep 17 00:00:00 2001 From: serso Date: Thu, 7 Jan 2016 17:15:54 +0100 Subject: [PATCH] minSdkVersion brought back to 9 --- app/build.gradle | 6 +++--- app/proguard-debug.cfg | 3 +++ app/proguard.cfg | 3 +++ .../solovyev/android/calculator/CalculatorApplication.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 79d42ea8..e5a9b952 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { compileSdkVersion 23 buildToolsVersion '23.0.2' defaultConfig { - minSdkVersion 15 + minSdkVersion 9 targetSdkVersion 23 versionCode 143 versionName '2.1.4' @@ -61,7 +61,7 @@ dependencies { compile 'org.solovyev:common-security:1.0.7' compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:appcompat-v7:23.1.1' - compile('ch.acra:acra:4.5.0') { + compile('ch.acra:acra:4.7.0') { exclude group: 'org.json' } compile 'org.solovyev.android.views.dragbutton:drag-button:1.0@aar' @@ -81,7 +81,7 @@ dependencies { compile 'com.google.android.gms:play-services-analytics:8.4.0' compile 'com.melnykov:floatingactionbutton:1.1.0' compile(name: 'plotter', ext: 'aar') - testCompile "com.squareup.leakcanary:leakcanary-android-no-op:1.3.1" + testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' compile 'org.solovyev:common-text:1.0.7' diff --git a/app/proguard-debug.cfg b/app/proguard-debug.cfg index cdc52c20..6fbaac11 100644 --- a/app/proguard-debug.cfg +++ b/app/proguard-debug.cfg @@ -68,6 +68,9 @@ -dontwarn com.google.android.gms.internal.** -dontwarn com.google.android.gms.common.internal.** +-keep class com.squareup.leakcanary.** { *; } +-dontwarn com.squareup.leakcanary.** + -keep class org.simpleframework.xml.** { *; } -keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity -keep class * implements org.solovyev.android.calculator.MathEntityPersistenceContainer diff --git a/app/proguard.cfg b/app/proguard.cfg index 2f65c49c..311ff605 100644 --- a/app/proguard.cfg +++ b/app/proguard.cfg @@ -67,6 +67,9 @@ -dontwarn com.google.android.gms.internal.** -dontwarn com.google.android.gms.common.internal.** +-keep class com.squareup.leakcanary.** { *; } +-dontwarn com.squareup.leakcanary.** + -keep class org.simpleframework.xml.** { *; } -keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity -keep class * implements org.solovyev.android.calculator.MathEntityPersistenceContainer diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java index db8883c5..93752874 100644 --- a/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java +++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java @@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; -@ReportsCrashes(formKey = "", +@ReportsCrashes( formUri = "https://serso.cloudant.com/acra-cpp/_design/acra-storage/_update/report", reportType = org.acra.sender.HttpSender.Type.JSON, httpMethod = org.acra.sender.HttpSender.Method.PUT,