Fixed: empty changelog

sal0max · Dec 7, 2022 · eb573f8 · eb573f8
1 parent cdf778c
commit eb573f8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         minSdkVersion 26
         targetSdkVersion 33
         // SemVer
-        versionName = '1.17.6'
-        versionCode = 11706
+        versionName = '1.17.7'
+        versionCode = 11707
         archivesBaseName = "$applicationId-v$versionCode"
     }
 
@@ -36,9 +36,8 @@ android {
             minifyEnabled true
             shrinkResources true
             zipAlignEnabled true
-            proguardFiles [
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"),
                     'proguard-rules.pro'
-            ]
         }
         debug {
             applicationIdSuffix '.debug'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,21 +1 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-keep class de.salomax.currencies.R$array { public *** changelog_*; }
diff --git a/app/src/main/kotlin/de/salomax/currencies/view/preference/ChangelogDialog.kt b/app/src/main/kotlin/de/salomax/currencies/view/preference/ChangelogDialog.kt
@@ -16,6 +16,7 @@ class ChangelogDialog : AppCompatDialogFragment() {
         val view = View.inflate(context, R.layout.fragment_changelog, null)
         val textView = view.findViewById<TextView>(R.id.changelog)
 
+        // HINT: needs proguard rule to work in release config
         for (declaredField in R.array::class.java.declaredFields
             .filter { field -> field.name.startsWith("changelog_") }
             .sortedByDescending { field ->

diff --git a/app/src/main/res/values-de/changelog.xml b/app/src/main/res/values-de/changelog.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="changelog_1.17.7">
+        <item>Behoben: leeres Änderungsprotokoll</item>
+    </string-array>
+
     <string-array name="changelog_1.17.6">
         <item>Neue Übersetzungen! Isländisch von nazrin 🇮🇸, Portugiesisch (Brasilien) von Cavernosa 🇧🇷 und Schwedisch von Samuel 🇸🇪. Großartig!</item>
     </string-array>

diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="changelog_1.17.7">
+        <item>Fixed: empty changelog</item>
+    </string-array>
+
     <string-array name="changelog_1.17.6">
         <item>New translations! Icelandic by nazrin 🇮🇸, Portuguese (Brazil) by Cavernosa 🇧🇷 and Swedish by Samuel 🇸🇪. Awesome!</item>
     </string-array>

diff --git a/fastlane/metadata/android/de/changelogs/11707.txt b/fastlane/metadata/android/de/changelogs/11707.txt
@@ -0,0 +1 @@
+- Behoben: leeres Änderungsprotokoll
diff --git a/fastlane/metadata/android/en-US/changelogs/11707.txt b/fastlane/metadata/android/en-US/changelogs/11707.txt
@@ -0,0 +1 @@
+- Fixed: empty changelog