From a8fd1d1971cb724e2949e6575e34ae1c9e4d6ff0 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Fri, 25 Mar 2022 00:03:17 +0600 Subject: [PATCH] shipping single android bundle containing all available ABIs for simplicity --- .github/workflows/flutter-build.yml | 6 ++---- Makefile | 5 +---- README.md | 7 +------ android/app/src/main/AndroidManifest.xml | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 8af6cb47..b44e7275 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -28,7 +28,7 @@ jobs: - run: pip3 install appimage-builder - run: make appimage # Building Android Application - - run: flutter build apk --split-per-abi + - run: flutter build apk - run: make apk - uses: actions/upload-artifact@v2 with: @@ -37,9 +37,7 @@ jobs: build/Spotube-linux-x86_64.deb build/Spotube-linux-x86_64.tar.xz build/Spotube-*-x86_64.AppImage - build/Spotube-android-arm64-v8a.apk - build/Spotube-android-armeabi-v7a.apk - build/Spotube-android-x86_64.apk + build/Spotube-android-all-arch.apk build_windows: runs-on: windows-latest steps: diff --git a/Makefile b/Makefile index 5e0647aa..0a7d7e2f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ INNO_VERSION=6.2.0 TEMP_DIR=/tmp/spotube-tar USR_SHARE=deb-struct/usr/share BUNDLE_DIR=build/linux/x64/release/bundle -ANDROID_OUTPUT_DIR=build/app/outputs/apk/release MIRRORLIST=${PWD}/build/mirrorlist deb: mkdir -p ${USR_SHARE}/spotube\ @@ -52,9 +51,7 @@ choco: powershell choco pack .\choco-struct\spotube.nuspec --outputdirectory build apk: - mv ${ANDROID_OUTPUT_DIR}/app-arm64-v8a-release.apk build/Spotube-android-arm64-v8a.apk\ - && mv ${ANDROID_OUTPUT_DIR}/app-armeabi-v7a-release.apk build/Spotube-android-armeabi-v7a.apk\ - && mv ${ANDROID_OUTPUT_DIR}/app-x86_64-release.apk build/Spotube-android-x86_64.apk + mv build/app/outputs/apk/release/app-release.apk build/Spotube-android-all-arch.apk gensums: sh -c scripts/gensums.sh diff --git a/README.md b/README.md index da7cb727..5bb01180 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,7 @@ All the binaries are located in the [releases](https://github.com/krtirtho/spotu ## Android -Download the Android app according to your device's CPU architecture -- [arm64-v8a (for 64 bit ARM)](https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-arm64-v8a.apk) -- [armeabi-v7a (for 32 bit ARM)](https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-armeabi-v7a.apk) -- [x86_64 (for 64 bit x86/amd64)](https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-x86_64.apk) - -Then install it on your Android smartphone/tablet +Download the [Android app](https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-all-arch.apk) & then install it on your Android smartphone/tablet ## Windows diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 97ea4c61..186c10e4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ - +