Merge pull request utkarshdalal#277 from utkarshdalal/cleanup-0.6.0-pre

utkarshdalal · web-flow · commit cf636ea3ebed · 2025-11-20T18:04:08.000+05:30
updated workflow for dual-builds, some small improvements for 0.6.0 p…
diff --git a/.github/workflows/app-release-signed.yml b/.github/workflows/app-release-signed.yml
@@ -36,12 +36,28 @@ jobs:
         KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
         KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
       run: |
+        mkdir -p app/keystores
         echo "$KEYSTORE" | base64 --decode > app/keystores/keystore
         echo "storeFile=keystores/keystore" >> app/keystores/keystore.properties
         echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> app/keystores/keystore.properties
         echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> app/keystores/keystore.properties
         echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> app/keystores/keystore.properties
 
+    - name: Configure Production Keystore
+      env:
+        PROD_KEYSTORE: ${{ secrets.PROD_KEYSTORE }}
+        PROD_KEYSTORE_KEY_ALIAS: ${{ secrets.PROD_KEYSTORE_KEY_ALIAS }}
+        PROD_KEYSTORE_KEY_PASSWORD: ${{ secrets.PROD_KEYSTORE_KEY_PASSWORD }}
+        PROD_KEYSTORE_STORE_PASSWORD: ${{ secrets.PROD_KEYSTORE_STORE_PASSWORD }}
+      run: |
+        mkdir -p app/keystores
+        echo "$PROD_KEYSTORE" | base64 --decode > app/keystores/prod.keystore
+        cat <<EOF > app/keystores/prod-keystore.properties
+        keyAlias=$PROD_KEYSTORE_KEY_ALIAS
+        keyPassword=$PROD_KEYSTORE_KEY_PASSWORD
+        storePassword=$PROD_KEYSTORE_STORE_PASSWORD
+        EOF
+
     - name: Inject credentials
       run: |
         cat <<EOF > local.properties
@@ -51,13 +67,47 @@ jobs:
         SUPABASE_KEY=${{ secrets.SUPABASE_KEY }}
         EOF
 
+    - name: Install Android SDK Build Tools
+      run: |
+        SDKMANAGER="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
+        if [ ! -x "$SDKMANAGER" ]; then
+          SDKMANAGER="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
+        fi
+        yes | "$SDKMANAGER" --install "build-tools;34.0.0"
+
     - name: Build with Gradle
-      run: ./gradlew :app:bundleRelease-signed
+      run: ./gradlew :app:bundleRelease
 
     - name: Extract APK from Bundle
       run: |
-        java -jar tools/bundletool-all-1.17.2.jar build-apks --bundle=app/build/outputs/bundle/release-signed/app-release-signed.aab --output=app-release-signed.apks --mode=universal --ks='app/keystores/keystore' --ks-pass='pass:${{ secrets.KEYSTORE_STORE_PASSWORD }}' --ks-key-alias='${{ secrets.KEYSTORE_KEY_ALIAS }}' --key-pass='pass:${{ secrets.KEYSTORE_KEY_PASSWORD }}'
-        unzip app-release-signed.apks
+        java -jar tools/bundletool-all-1.17.2.jar build-apks --bundle=app/build/outputs/bundle/release/app-release.aab --output=app-release.apks --mode=universal
+        unzip -o app-release.apks universal.apk
+
+    - name: Dual sign universal APK
+      env:
+        DEBUG_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
+        DEBUG_KEY_PASS: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
+        DEBUG_STORE_PASS: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
+        PROD_ALIAS: ${{ secrets.PROD_KEYSTORE_KEY_ALIAS }}
+        PROD_KEY_PASS: ${{ secrets.PROD_KEYSTORE_KEY_PASSWORD }}
+        PROD_STORE_PASS: ${{ secrets.PROD_KEYSTORE_STORE_PASSWORD }}
+      run: |
+        BUILD_TOOLS_DIR="${ANDROID_HOME}/build-tools/34.0.0"
+        if [ ! -d "$BUILD_TOOLS_DIR" ]; then
+          BUILD_TOOLS_DIR="${ANDROID_SDK_ROOT}/build-tools/34.0.0"
+        fi
+        "${BUILD_TOOLS_DIR}/apksigner" sign \
+          --ks app/keystores/keystore \
+          --ks-key-alias "$DEBUG_ALIAS" \
+          --ks-pass pass:$DEBUG_STORE_PASS \
+          --key-pass pass:$DEBUG_KEY_PASS \
+          --next-signer --ks app/keystores/prod.keystore \
+          --ks-key-alias "$PROD_ALIAS" \
+          --ks-pass pass:$PROD_STORE_PASS \
+          --key-pass pass:$PROD_KEY_PASS \
+          --out universal-signed.apk \
+          universal.apk
+        mv universal-signed.apk universal.apk
 
     - name: Upload Artifact
       id: upload_app
diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
@@ -33,12 +33,28 @@ jobs:
           KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
           KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
         run: |
+          mkdir -p app/keystores
           echo "$KEYSTORE" | base64 --decode > app/keystores/keystore
           echo "storeFile=keystores/keystore" >> app/keystores/keystore.properties
           echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> app/keystores/keystore.properties
           echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> app/keystores/keystore.properties
           echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> app/keystores/keystore.properties
 
+      - name: Configure Production Keystore
+        env:
+          PROD_KEYSTORE: ${{ secrets.PROD_KEYSTORE }}
+          PROD_KEYSTORE_KEY_ALIAS: ${{ secrets.PROD_KEYSTORE_KEY_ALIAS }}
+          PROD_KEYSTORE_KEY_PASSWORD: ${{ secrets.PROD_KEYSTORE_KEY_PASSWORD }}
+          PROD_KEYSTORE_STORE_PASSWORD: ${{ secrets.PROD_KEYSTORE_STORE_PASSWORD }}
+        run: |
+          mkdir -p app/keystores
+          echo "$PROD_KEYSTORE" | base64 --decode > app/keystores/prod.keystore
+          cat <<EOF > app/keystores/prod-keystore.properties
+          keyAlias=$PROD_KEYSTORE_KEY_ALIAS
+          keyPassword=$PROD_KEYSTORE_KEY_PASSWORD
+          storePassword=$PROD_KEYSTORE_STORE_PASSWORD
+          EOF
+
       - name: Inject credentials
         run: |
           cat <<EOF > local.properties
@@ -48,21 +64,50 @@ jobs:
           SUPABASE_KEY=${{ secrets.SUPABASE_KEY }}
           EOF
 
+      - name: Install Android SDK Build Tools
+        run: |
+          SDKMANAGER="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
+          if [ ! -x "$SDKMANAGER" ]; then
+            SDKMANAGER="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
+          fi
+          yes | "$SDKMANAGER" --install "build-tools;34.0.0"
+
       - name: Build with Gradle
-        run: ./gradlew :app:bundleRelease-signed
+        run: ./gradlew :app:bundleRelease
 
       - name: Extract APK from Bundle
         run: |
           java -jar tools/bundletool-all-1.17.2.jar build-apks \
-            --bundle=app/build/outputs/bundle/release-signed/app-release-signed.aab \
-            --output=app-release-signed.apks \
-            --mode=universal \
-            --ks=app/keystores/keystore \
-            --ks-pass=pass:${{ secrets.KEYSTORE_STORE_PASSWORD }} \
-            --ks-key-alias=${{ secrets.KEYSTORE_KEY_ALIAS }} \
-            --key-pass=pass:${{ secrets.KEYSTORE_KEY_PASSWORD }}
-
-          unzip app-release-signed.apks universal.apk
+            --bundle=app/build/outputs/bundle/release/app-release.aab \
+            --output=app-release.apks \
+            --mode=universal
+          unzip -o app-release.apks universal.apk
+
+      - name: Dual sign universal APK
+        env:
+          DEBUG_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
+          DEBUG_KEY_PASS: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
+          DEBUG_STORE_PASS: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
+          PROD_ALIAS: ${{ secrets.PROD_KEYSTORE_KEY_ALIAS }}
+          PROD_KEY_PASS: ${{ secrets.PROD_KEYSTORE_KEY_PASSWORD }}
+          PROD_STORE_PASS: ${{ secrets.PROD_KEYSTORE_STORE_PASSWORD }}
+        run: |
+          BUILD_TOOLS_DIR="${ANDROID_HOME}/build-tools/34.0.0"
+          if [ ! -d "$BUILD_TOOLS_DIR" ]; then
+            BUILD_TOOLS_DIR="${ANDROID_SDK_ROOT}/build-tools/34.0.0"
+          fi
+          "${BUILD_TOOLS_DIR}/apksigner" sign \
+            --ks app/keystores/keystore \
+            --ks-key-alias "$DEBUG_ALIAS" \
+            --ks-pass pass:$DEBUG_STORE_PASS \
+            --key-pass pass:$DEBUG_KEY_PASS \
+            --next-signer --ks app/keystores/prod.keystore \
+            --ks-key-alias "$PROD_ALIAS" \
+            --ks-pass pass:$PROD_STORE_PASS \
+            --key-pass pass:$PROD_KEY_PASS \
+            --out universal-signed.apk \
+            universal.apk
+          mv universal-signed.apk universal.apk
 
       - name: Upload APK for next job
         uses: actions/upload-artifact@v4
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -52,7 +52,7 @@ android {
         targetSdk = 28
 
         versionCode = 6
-        versionName = "0.5.2"
+        versionName = "0.6.0"
 
         buildConfigField("boolean", "GOLD", "false")
         fun secret(name: String) =
@@ -195,21 +195,13 @@ dependencies {
     val localBuild = false // Change to 'true' needed when building JavaSteam manually
     if (localBuild) {
         implementation(files("../../JavaSteam/build/libs/javasteam-1.8.0-SNAPSHOT.jar"))
-        implementation(files("../../JavaSteam/build/libs/javasteam-tf:1.8.0-SNAPSHOT"))
-        implementation(files("../../JavaSteam/build/libs/javasteam-dota2:1.8.0-SNAPSHOT"))
         implementation(files("../../JavaSteam/build/libs/javasteam-depotdownloader:1.8.0-SNAPSHOT"))
-        implementation(files("../../JavaSteam/build/libs/javasteam-deadlock:1.8.0-SNAPSHOT"))
-        implementation(files("../../JavaSteam/build/libs/javasteam-cs:1.8.0-SNAPSHOT"))
         implementation(libs.bundles.steamkit.dev)
     } else {
         implementation(libs.steamkit) {
             isChanging = version?.contains("SNAPSHOT") ?: false
         }
-        implementation("in.dragonbra:javasteam-tf:1.8.0-SNAPSHOT")
-        implementation("in.dragonbra:javasteam-dota2:1.8.0-SNAPSHOT")
         implementation("in.dragonbra:javasteam-depotdownloader:1.8.0-SNAPSHOT")
-        implementation("in.dragonbra:javasteam-deadlock:1.8.0-SNAPSHOT")
-        implementation("in.dragonbra:javasteam-cs:1.8.0-SNAPSHOT")
     }
     implementation(libs.spongycastle)
 
diff --git a/app/src/main/java/com/winlator/xenvironment/components/GlibcProgramLauncherComponent.java b/app/src/main/java/com/winlator/xenvironment/components/GlibcProgramLauncherComponent.java
@@ -254,7 +254,6 @@ private void addBox64EnvVars(EnvVars envVars, boolean enableLogs) {
         }
 
         envVars.putAll(Box86_64PresetManager.getEnvVars("box64", environment.getContext(), box64Preset));
-        if (wow64Mode) envVars.put("BOX64_MMAP32", "1");
         String renderer = GPUInformation.getRenderer(context);
         if (renderer.contains("Mali"))
             envVars.put("BOX64_MMAP32", "0");

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,6 @@ private void addBox64EnvVars(EnvVars envVars, boolean enableLogs) {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`envVars.putAll(Box86_64PresetManager.getEnvVars("box64", environment.getContext(), box64Preset));`
`257`		`- if (wow64Mode) envVars.put("BOX64_MMAP32", "1");`
`258`	`257`	`String renderer = GPUInformation.getRenderer(context);`
`259`	`258`	`if (renderer.contains("Mali"))`
`260`	`259`	`envVars.put("BOX64_MMAP32", "0");`