From 6f229e0f332920dc82cc75344042eaa58627ff75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Mon, 10 Oct 2016 21:20:45 +0200 Subject: [PATCH] Releasing application version 1.1 --- app/build.gradle | 4 +-- app/proguard-rules.pro | 4 +-- app/src/main/assets/logback.xml | 25 +------------------ .../urbanexplorer/AppConstants.java | 2 +- googleutils/proguard-rules.pro | 4 +-- panoramiobindings/build.gradle | 4 +-- urbanexplorerutils/build.gradle | 4 +-- wikibinding/build.gradle | 4 +-- 8 files changed, 14 insertions(+), 37 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3e1894f..54da986 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "pl.tpolgrabia.urbanexplorer" minSdkVersion 16 targetSdkVersion 21 - versionCode 3 - versionName "1.0.2" + versionCode 4 + versionName "1.1" } signingConfigs { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1c4435f..da57a12 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -19,8 +19,8 @@ -keepattributes Signature -keepattributes InnerClasses -dontwarn ch.qos.logback.core.net.** -# -assumenosideeffects class ch.qos.logback.** { *; } -# -assumenosideeffects class org.slf4j.** { *; } +-assumenosideeffects class ch.qos.logback.** { *; } +-assumenosideeffects class org.slf4j.** { *; } -keep class com.crashlytics.** { *; } -dontwarn com.crashlytics.** -dontwarn retrofit2.** diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml index e774280..8709039 100644 --- a/app/src/main/assets/logback.xml +++ b/app/src/main/assets/logback.xml @@ -1,23 +1,5 @@ - - - - - ${LOG_DIR}/logs/urban-explorer.txt - - %d{HH:mm:ss.SSS} [%-20thread] %-5level %logger{36} - %msg\n - - - - - ${LOG_DIR}/log.%d.txt - - - 7 - - - %logger{12} @@ -27,12 +9,7 @@ - - - - - - + diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java index d2eeb0f..abfeb0c 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java @@ -6,7 +6,7 @@ import java.util.Locale; * Created by tpolgrabia on 27.08.16. */ public class AppConstants { - public static final AppStage RELEASE = AppStage.RELEASE_CANDIDATE; + public static final AppStage RELEASE = AppStage.FINAL; public static final float MIN_DISTANCE = 100; public static final long GPS_LOCATION_UPDATE_FREQ = 15000; public static final float GPS_LOCATION_DISTANCE_FREQ = MIN_DISTANCE; diff --git a/googleutils/proguard-rules.pro b/googleutils/proguard-rules.pro index 85a3716..fc6d669 100644 --- a/googleutils/proguard-rules.pro +++ b/googleutils/proguard-rules.pro @@ -48,8 +48,8 @@ -keep class javax.inject.** { *; } -keep class retrofit.** { *; } --keep class ch.qos.logback.** { *; } --keep class org.slf4j.** { *; } +-assumenosideeffects class ch.qos.logback.** { *; } +-assumenosideeffects class org.slf4j.** { *; } # Proguard rules for retrofit diff --git a/panoramiobindings/build.gradle b/panoramiobindings/build.gradle index 8ef1649..cf40321 100644 --- a/panoramiobindings/build.gradle +++ b/panoramiobindings/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 21 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.1" } buildTypes { release { diff --git a/urbanexplorerutils/build.gradle b/urbanexplorerutils/build.gradle index 7df160b..092701b 100644 --- a/urbanexplorerutils/build.gradle +++ b/urbanexplorerutils/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 21 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.1" } buildTypes { release { diff --git a/wikibinding/build.gradle b/wikibinding/build.gradle index 97143bb..424350d 100644 --- a/wikibinding/build.gradle +++ b/wikibinding/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 21 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.1" } buildTypes { release {