Prepare APK for F-Droid

.github/workflows/android-build.yml

@@ -35,10 +35,24 @@ jobs:
         id: commit
         uses: pr-mpt/actions-commit-hash@v1
 
-      - name: 'Upload .apk Release Artifact (for Release)'
+      - name: 'Upload universal .apk Release Artifac'
         uses: actions/upload-artifact@v3
         if: ${{ github.event_name != 'pull_request' }}
         with:
-          name: nostros-${{ github.ref_name }}.apk
-          path: android/app/build/outputs/apk/release/app-release.apk
+          name: nostros-${{ github.ref_name }}-universal.apk
+          path: android/app/build/outputs/apk/release/app-universal-release.apk
+
+      - name: 'Upload arm64-v8a .apk Release Artifac'
+        uses: actions/upload-artifact@v3
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          name: nostros-${{ github.ref_name }}-arm64-v8a.apk
+          path: android/app/build/outputs/apk/release/app-arm64-v8a-release.apk
+
+      - name: 'Upload armeabi-v7a .apk Release Artifac'
+        uses: actions/upload-artifact@v3
+        if: ${{ github.event_name != 'pull_request' }}
+        with:
+          name: nostros-${{ github.ref_name }}-armeabi-v7a.apk
+          path: android/app/build/outputs/apk/release/app-armeabi-v7a-release.apk
 

.github/workflows/release.yml

@@ -28,14 +28,14 @@ jobs:
 
             **Download**
 
-            https://github.com/KoalaSat/nostros/releases/download/${{ github.ref_name }}/nostros-${{ github.ref_name }}.apk
+            https://github.com/KoalaSat/nostros/releases/download/${{ github.ref_name }}/nostros-${{ github.ref_name }}-universal.apk
       # Upload APK artifact asset
       - name: 'Download APK Artifact'
         uses: actions/download-artifact@v3
         with:
           name: nostros-${{ github.ref_name }}.apk
           path: .
-      - name: 'Upload APK Asset'
+      - name: 'Upload universal APK Asset'
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
@@ -43,5 +43,25 @@ jobs:
         with:
           upload_url: ${{ steps.create-release.outputs.upload_url }}
           asset_path: app-release.apk
-          asset_name: nostros-${{ github.ref_name }}.apk
+          asset_name: nostros-${{ github.ref_name }}-universal.apk
+          asset_content_type: application/apk
+      - name: 'Upload arm64-v8a APK Asset'
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create-release.outputs.upload_url }}
+          asset_path: app-release.apk
+          asset_name: nostros-${{ github.ref_name }}-arm64-v8a.apk
+          asset_content_type: application/apk
+      - name: 'Upload armeabi-v7a APK Asset'
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create-release.outputs.upload_url }}
+          asset_path: app-release.apk
+          asset_name: nostros-${{ github.ref_name }}-armeabi-v7a.apk
           asset_content_type: application/apk

android/app/build.gradle

@@ -93,7 +93,7 @@ apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = false
+def enableSeparateBuildPerCPUArchitecture = true
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
@@ -154,11 +154,6 @@ android {
                         "-DANDROID_STL=c++_shared"
                 }
             }
-            if (!enableSeparateBuildPerCPUArchitecture) {
-                ndk {
-                    abiFilters (*reactNativeArchitectures())
-                }
-            }
         }
     }
 
@@ -207,7 +202,7 @@ android {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
+            universalApk true  // If true, also generate a universal APK
             include (*reactNativeArchitectures())
         }
     }
@@ -226,6 +221,7 @@ android {
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
+            debuggable false
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"