diff --git a/forge-gui-android/libs/gdx-controllers-android.jar b/forge-gui-android/libs/gdx-controllers-android.jar new file mode 100644 index 00000000000..7ebd2b4df97 Binary files /dev/null and b/forge-gui-android/libs/gdx-controllers-android.jar differ diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 35395f44770..372ea4318f4 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -177,7 +177,8 @@ com.badlogicgames.gdx-controllers gdx-controllers-android 2.2.3 - aar + system + ${pom.basedir}/libs/gdx-controllers-android.jar com.badlogicgames.gdx diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index cd7a0392e29..7079b6c5d64 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -2,8 +2,10 @@ #-optimizationpasses 3 -dontusemixedcaseclassnames -dontskipnonpubliclibraryclasses +# disable the -dontpreverify since it produces tons of warning when compiled using Android 14 and newer Build-tools #-dontpreverify -verbose +# IntelliJ marks -android is invalid since the default inspection uses R8, we use Proguard exclusively and -android is available. -android # https://stackoverflow.com/a/32615580 -optimizations !code/simplification/*,!field/*,!class/merging/*,!code/allocation/variable,!library/gson,!class/unboxing/enum @@ -102,7 +104,8 @@ -keep public class * extends android.content.ContentProvider -keep public class * extends android.app.backup.BackupAgentHelper -keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService +# ILicensingService is not available on robolectric dependency +#-keep public class com.android.vending.licensing.ILicensingService -keep public class * extends com.badlogic.gdx.Application -keepclasseswithmembernames,includedescriptorclasses class * {