From a2546d5875237f32b17007e94066e4965baca7d8 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 21 Sep 2022 14:46:07 -0400 Subject: [PATCH] v1.4.0: adjusted proguard rules to fix crashes with new AGP --- android/proguard-rules.pro | 4 ++-- build.gradle | 4 ++-- .../shatteredpixeldungeon/ui/changelist/v1_X_Changes.java | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro index 4f48b77d8..8d2ba327d 100644 --- a/android/proguard-rules.pro +++ b/android/proguard-rules.pro @@ -19,8 +19,8 @@ -dontwarn com.badlogic.gdx.jnigen.BuildTarget* # needed for libGDX skin reflection used in text fields. Perhaps just don't use skin? --keepnames class com.badlogic.gdx.graphics.Color { *; } --keepnames class com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle { *; } +-keep class com.badlogic.gdx.graphics.Color { *; } +-keep class com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle { *; } # needed for libGDX controllers -keep class com.badlogic.gdx.controllers.android.AndroidControllers { *; } diff --git a/build.gradle b/build.gradle index a53d1f222..bab059d47 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ allprojects { appName = 'Shattered Pixel Dungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' - appVersionCode = 653 - appVersionName = '1.4.0-ALPHA-3' + appVersionCode = 654 + appVersionName = '1.4.0-ALPHA-4' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java index df032e437..e43fb3909 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java @@ -91,10 +91,13 @@ public class v1_X_Changes { changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); - changes = new ChangeInfo("", false, null); + changes = new ChangeInfo("ALPHA-4", false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes); + changes.addButton(new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), + "Fixed and Android-specific bug that caused crashes with text input windows")); + changes = new ChangeInfo("ALPHA-3", false, null); changes.hardlight(Window.TITLE_COLOR); changeInfos.add(changes);