Merge pull request #954 from gerhardol/feature/r8-enable

Prepare for 2.2.0.3
jonasoreland · Aug 1, 2020 · 51ccb4b · 51ccb4b
2 parents 2040acf + 504d3dc
commit 51ccb4b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,11 +5,11 @@
 </head>
 <body>
 <h1>What's new</h1>
-<h2>v2.2.0.0</h2>
+<h2>v2.2.0.3</h2>
 <p>
 <ul>
     <li>Version changed to 2.2 for Play release, previous production is 2.1.0.0</li>
-    <li>#949 Play console crash corrections</li>
+    <li>#949 #951 Play console crash corrections</li>
     <li>#948 Target Android 10, update permission handling
         <br>Changes required to target Android 10 and prepare for Android 11/R, required to update
         the app in Play.

diff --git a/app/proguard.txt b/app/proguard.txt
@@ -85,7 +85,7 @@
 # Picasso
 -dontnote com.squareup.**
 
--dontwarn android.support.**
+#-dontwarn android.support.**
 -dontwarn java.lang.**
 -dontwarn org.codehaus.**
 -dontwarn com.google.**
@@ -138,28 +138,28 @@
 
 ## Android architecture components: Lifecycle
 # LifecycleObserver's empty constructor is considered to be unused by proguard
--keepclassmembers class * implements android.arch.lifecycle.LifecycleObserver {
+-keepclassmembers class * implements androidx.lifecycle.LifecycleObserver {
     <init>(...);
 }
 # ViewModel's empty constructor is considered to be unused by proguard
--keepclassmembers class * extends android.arch.lifecycle.ViewModel {
+-keepclassmembers class * extends androidx.lifecycle.ViewModel {
     <init>(...);
 }
 
 # keep Lifecycle State and Event enums values
--keepclassmembers class android.arch.lifecycle.Lifecycle$State { *; }
--keepclassmembers class android.arch.lifecycle.Lifecycle$Event { *; }
+-keepclassmembers class androidx.lifecycle.Lifecycle$State { *; }
+-keepclassmembers class androidx.lifecycle.Lifecycle$Event { *; }
 # keep methods annotated with @OnLifecycleEvent even if they seem to be unused
 # (Mostly for LiveData.LifecycleBoundObserver.onStateChange(), but who knows)
 -keepclassmembers class * {
-    @android.arch.lifecycle.OnLifecycleEvent *;
+    @androidx.lifecycle.OnLifecycleEvent *;
 }
 
--keepclassmembers class * implements android.arch.lifecycle.LifecycleObserver {
+-keepclassmembers class * implements androidx.lifecycle.LifecycleObserver {
     <init>(...);
 }
 
--keep class * implements android.arch.lifecycle.LifecycleObserver {
+-keep class * implements androidx.lifecycle.LifecycleObserver {
     <init>(...);
 }
 -keepclassmembers class android.arch.** { *; }

diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,8 @@ project.ext {
     mockitoVersion = '2.3.7'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.2.0.0'
-    versionCode = 250
+    versionName = '2.2.0.3'
+    versionCode = 253
     latestBaseVersionCode = 15000000
 
     travisBuild = System.getenv("TRAVIS") == "true"

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
-android.enableR8=false
+# R8 is not displaying warnings for configuration issues, proguard may be required
+# Build with ./gradlew app:minifyLatestReleaseWithProguard
+#android.enableR8=false
 android.enableJetifier=true
 android.useAndroidX=true