fix: enhance ProGuard rules for XmlResourceParser inheritance

.github/workflows/android-release.yml

@@ -11,7 +11,67 @@ permissions:
   actions: read
 
 jobs:
-  release:
+  build-universal:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+      
+    - name: Create keystore
+      run: |
+        echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
+      
+    - name: Cache Gradle packages
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+          
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+      
+    - name: Build Universal APK
+      run: ./gradlew assembleRelease
+      env:
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        
+    - name: Rename Universal APK
+      run: |
+        cd app/build/outputs/apk/release
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION_TAG=${GITHUB_REF#refs/tags/}
+        else
+          VERSION_TAG="dev-${GITHUB_SHA:0:7}"
+        fi
+        BUILD_NUMBER=${GITHUB_RUN_NUMBER}
+        TIMESTAMP=$(date +"%Y%m%d_%H%M")
+        for file in *universal*.apk; do
+          mv "$file" "LBJ_Console_${VERSION_TAG}_universal_release_${BUILD_NUMBER}_${TIMESTAMP}.apk"
+        done
+        
+    - name: Upload Universal APK
+      uses: actions/upload-artifact@v4
+      with:
+        name: LBJ-Console-universal-release
+        path: app/build/outputs/apk/release/LBJ_Console_*_universal_release_*.apk
+
+  build-specific:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -30,6 +90,10 @@ jobs:
     - name: Setup Android SDK
       uses: android-actions/setup-android@v3
       
+    - name: Create keystore
+      run: |
+        echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
+      
     - name: Cache Gradle packages
       uses: actions/cache@v4
       with:
@@ -45,7 +109,8 @@ jobs:
       
     - name: Modify build.gradle for specific ABI
       run: |
-        sed -i 's/abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")/abiFilters += listOf("${{ matrix.abi }}")/g' app/build.gradle.kts
+        sed -i 's/include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")/include("${{ matrix.abi }}")/g' app/build.gradle.kts
+        sed -i 's/isUniversalApk = true/isUniversalApk = false/g' app/build.gradle.kts
       
     - name: Build Release APK for ${{ matrix.abi }}
       run: ./gradlew assembleRelease
@@ -57,18 +122,25 @@ jobs:
     - name: Rename APK with ABI suffix
       run: |
         cd app/build/outputs/apk/release
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION_TAG=${GITHUB_REF#refs/tags/}
+        else
+          VERSION_TAG="dev-${GITHUB_SHA:0:7}"
+        fi
+        BUILD_NUMBER=${GITHUB_RUN_NUMBER}
+        TIMESTAMP=$(date +"%Y%m%d_%H%M")
         for file in *.apk; do
-          mv "$file" "${file%.apk}-${{ matrix.abi }}.apk"
+          mv "$file" "LBJ_Console_${VERSION_TAG}_${{ matrix.abi }}_release_${BUILD_NUMBER}_${TIMESTAMP}.apk"
         done
         
-    - name: Upload APK artifact
+    - name: Upload APK
       uses: actions/upload-artifact@v4
       with:
-        name: apk-${{ matrix.abi }}
-        path: app/build/outputs/apk/release/*-${{ matrix.abi }}.apk
+        name: LBJ-Console-${{ matrix.abi }}-release
+        path: app/build/outputs/apk/release/LBJ_Console_*_${{ matrix.abi }}_release_*.apk
         
   create-release:
-    needs: release
+    needs: [build-universal, build-specific]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     

.gitignore

@@ -1,5 +1,6 @@
 *.iml
 .gradle
+.kotlin
 .idea/caches
 .idea/libraries
 .idea/modules.xml
@@ -13,4 +14,8 @@ captures
 .cxx
 local.properties
 local.properties
-*.ps1
+*.ps1
+.*.bat
+*.jks
+*.keystore
+*.base64

app/build.gradle.kts

@@ -13,12 +13,17 @@ android {
         minSdk = 29
         targetSdk = 35
         versionCode = 1
-        versionName = "1.0"
+        versionName = "0.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        
-        ndk {
-            abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
+    }
+
+    signingConfigs {
+        create("release") {
+            storeFile = file("../keystore.jks")
+            storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "android"
+            keyAlias = System.getenv("KEY_ALIAS") ?: "androidkey"
+            keyPassword = System.getenv("KEY_PASSWORD") ?: "android"
         }
     }
 
@@ -26,6 +31,7 @@ android {
         release {
             isMinifyEnabled = true
             isShrinkResources = true
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

app/proguard-rules.pro

@@ -15,8 +15,14 @@
 -keep class org.xmlpull.** { *; }
 -keep class org.kxml2.** { *; }
 -keep class android.content.res.XmlResourceParser { *; }
+-keep interface org.xmlpull.v1.XmlPullParser { *; }
+
+-keepclassmembers class android.content.res.XmlResourceParser {
+    <methods>;
+}
 
 -dontwarn org.osmdroid.**
 -dontwarn org.mapsforge.**
 -dontwarn org.xmlpull.**
--dontwarn org.kxml2.**
+-dontwarn org.kxml2.**
+-dontwarn android.content.res.XmlResourceParser