diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index b7ea00f57..07c4831ae 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -132,14 +132,6 @@ jobs: name: robosats-${{ inputs.semver }}-x86_64.apk path: mobile/android/app/build/outputs/apk/release/app-x86_64-release.apk - # Create app-x86-release APK artifact asset for Release - - name: 'Upload x86 .apk Release Artifact (for Release)' - uses: actions/upload-artifact@v4 - if: inputs.semver != '' # If this workflow is called from release.yml - with: - name: robosats-${{ inputs.semver }}-x86.apk - path: mobile/android/app/build/outputs/apk/release/app-x86-release.apk - - name: 'Create Pre-release' id: create_release if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) @@ -200,16 +192,3 @@ jobs: asset_path: ./mobile/android/app/build/outputs/apk/release/app-x86_64-release.apk asset_name: robosats-${{ steps.commit.outputs.short }}-x86_64.apk asset_content_type: application/apk - - # Upload x86 APK to pre-release - - name: 'Upload x86 Pre-release APK Asset' - id: upload-release-x86-apk-asset - if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release) - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./mobile/android/app/build/outputs/apk/release/app-x86-release.apk - asset_name: robosats-${{ steps.commit.outputs.short }}-x86.apk - asset_content_type: application/apk \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 710d00833..d7b54e10a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} - + desktop-build: uses: RoboSats/robosats/.github/workflows/desktop-build.yml@main needs: [frontend-build, check-versions] @@ -163,29 +163,12 @@ jobs: asset_name: robosats-${{ needs.check-versions.outputs.semver }}-x86_64.apk asset_content_type: application/apk - # Upload app-x86-release APK artifact asset - - name: 'Download x86 APK Artifact' - uses: actions/download-artifact@v4 - with: - name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk - path: . - - name: 'Upload x86 APK Asset' - id: upload-x86-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-x86-release.apk - asset_name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk - asset_content_type: application/apk - - name: 'Download macOS Build Artifact' uses: actions/download-artifact@v4 with: name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac-darwin-x64.zip path: . - + - name: 'Upload macOS Build Artifact' id: upload-release-mac-zip-asset uses: actions/upload-release-asset@v1 @@ -219,7 +202,7 @@ jobs: with: name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win32-ia32.zip path: . - + - name: 'Upload Windows Build Artifact' id: upload-release-win-zip-asset uses: actions/upload-release-asset@v1 diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index ca8e90778..44bc1ccba 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -124,7 +124,7 @@ def enableHermes = project.ext.react.get("enableHermes", false); */ def reactNativeArchitectures() { def value = project.getProperties().get("reactNativeArchitectures") - return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] + return value ? value.split(",") : ["armeabi-v7a", "x86_64", "arm64-v8a"] } android { @@ -144,7 +144,6 @@ android { pickFirst 'lib/armeabi-v7a/libruntimeexecutor.so' pickFirst 'lib/arm64-v8a/libruntimeexecutor.so' pickFirst 'lib/x86_64/libruntimeexecutor.so' - pickFirst 'lib/x86/libruntimeexecutor.so' } defaultConfig { @@ -264,7 +263,7 @@ android { // For each separate APK per architecture, set a unique version code as described here: // https://developer.android.com/studio/build/configure-apk-splits.html // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. - def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] + def versionCodes = ["armeabi-v7a": 1, "arm64-v8a": 3, "x86_64": 4] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = diff --git a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so index 8bc019992..bbff40718 100755 Binary files a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so and b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so differ diff --git a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so index 3e13c6d88..56655ed8e 100755 Binary files a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so and b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so differ diff --git a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so index 3775d2f03..373f2b991 100755 Binary files a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so and b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so differ diff --git a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so index 2cf9568ef..3f42760d4 100755 Binary files a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so and b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so differ diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties index cda6f7393..b0f06848a 100644 --- a/mobile/android/gradle.properties +++ b/mobile/android/gradle.properties @@ -27,7 +27,7 @@ android.enableJetifier=true # Use this property to specify which architecture you want to build. # You can also override it from the CLI using # ./gradlew -PreactNativeArchitectures=x86_64 -reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86_64 # Use this property to enable support to the new architecture. # This will allow you to use TurboModules and the Fabric render in