Android version bug fix

proj-android/.gitignore

@@ -61,6 +61,5 @@ app/jni/libpng
 app/jni/SDL
 app/jni/zlib
 
-app/src/main/assets/resources
-app/src/main/assets/audio
+app/src/main/assets
 

proj-android/app/build.gradle

@@ -1,4 +1,4 @@
-def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
+def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY')
 def buildAsApplication = !buildAsLibrary
 if (buildAsApplication) {
     apply plugin: 'com.android.application'
@@ -15,8 +15,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 37
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.0.6"
         externalNativeBuild {
             /*ndkBuild {
                 arguments "APP_PLATFORM=android-19"
@@ -31,7 +31,10 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            // Enables code optimizations.
+            minifyEnabled = true
+            // Enables resource shrinking.
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

proj-android/app/proguard-rules.pro

@@ -16,18 +16,21 @@
 #   public *;
 #}
 
--keep,includedescriptorclasses,allowoptimization class fishrungames.shadowoverbishkek.SDLInputConnection {
+# SDL2 specific rules
+-keep class org.libsdl.app.** { *; }
+
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLInputConnection {
     void nativeCommitText(java.lang.String, int);
     void nativeGenerateScancodeForUnichar(char);
 }
 
--keep,includedescriptorclasses class fishrungames.shadowoverbishkek.SDLActivity {
+-keep,includedescriptorclasses class org.libsdl.app.SDLActivity {
     # for some reason these aren't compatible with allowoptimization modifier
     boolean supportsRelativeMouse();
     void setWindowStyle(boolean);
 }
 
--keep,includedescriptorclasses,allowoptimization class fishrungames.shadowoverbishkek.SDLActivity {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLActivity {
     java.lang.String nativeGetHint(java.lang.String); # Java-side doesn't use this, so it gets minified, but C-side still tries to register it
     boolean onNativeSoftReturnKey();
     void onNativeKeyboardFocusLost();
@@ -62,7 +65,7 @@
     boolean showTextInput(int, int, int, int);
 }
 
--keep,includedescriptorclasses,allowoptimization class fishrungames.shadowoverbishkek.HIDDeviceManager {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.HIDDeviceManager {
     boolean initialize(boolean, boolean);
     boolean openDevice(int);
     int sendOutputReport(int, byte[]);
@@ -71,7 +74,7 @@
     void closeDevice(int);
 }
 
--keep,includedescriptorclasses,allowoptimization class fishrungames.shadowoverbishkek.SDLAudioManager {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLAudioManager {
     int[] getAudioOutputDevices();
     int[] getAudioInputDevices();
     int[] audioOpen(int, int, int, int, int);
@@ -90,9 +93,12 @@
     native void addAudioDevice(boolean, int);
 }
 
--keep,includedescriptorclasses,allowoptimization class fishrungames.shadowoverbishkek.SDLControllerManager {
+-keep,includedescriptorclasses,allowoptimization class org.libsdl.app.SDLControllerManager {
     void pollInputDevices();
     void pollHapticDevices();
     void hapticRun(int, float, int);
     void hapticStop(int);
 }
+
+# Keep our main activity
+-keep class fishrungames.shadowoverbishkek.ShadowOverBishkekActivity { *; }

proj-android/gradle.properties

@@ -19,7 +19,7 @@ android.r8.strictFullModeForKeepRules=false
 android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
 android.uniquePackageNames=false
 android.usesSdkInManifest.disallowed=false
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 
 # When configured, Gradle will run in incubating parallel mode.