From e1dad8fd6a5b0aecc90eacf2dfab67b02fa4db0f Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 30 Nov 2024 13:18:31 +1300 Subject: [PATCH 1/5] Add split apks --- .github/workflows/prod-android.yml | 4 ++-- materialious/android/app/build.gradle | 12 ++++++++++-- materialious/electron/package.json | 2 +- materialious/package-lock.json | 4 ++-- materialious/package.json | 2 +- update_versions.py | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index b88addb5..4c4e999e 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -67,8 +67,8 @@ jobs: - name: Move files to release run: | - mv app/build/outputs/app-release-signed.aab app/release/app-release-signed.aab - mv app/build/outputs/app-release-signed.apk app/release/app-release-signed.apk + mv app/build/outputs/*.aab app/release/ + mv app/build/outputs/*.apk app/release/ - name: get-npm-version id: package-version diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index a266297c..169abf9d 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 73 - versionName "1.6.22" + versionCode 74 + versionName "1.6.23" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. @@ -22,6 +22,14 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + splits { + abi { + enable true + reset() + include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' + universalApk true + } + } } repositories { diff --git a/materialious/electron/package.json b/materialious/electron/package.json index a8542882..6b2ccac7 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.22", + "version": "1.6.23", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package-lock.json b/materialious/package-lock.json index 4560b756..2252571c 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,12 +1,12 @@ { "name": "materialious", - "version": "1.6.22", + "version": "1.6.23", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.6.22", + "version": "1.6.23", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor/android": "6.1.2", diff --git a/materialious/package.json b/materialious/package.json index f273c2ca..b1cb0121 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.22", + "version": "1.6.23", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 23ec301c..32f44cd8 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.22" +LATEST_VERSION = "1.6.23" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From 9f097e3d8961c4e01218e10ee5c59ea43beaccbf Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 30 Nov 2024 13:19:38 +1300 Subject: [PATCH 2/5] Add v prefix --- .github/workflows/prod-android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 4c4e999e..5f9e00e8 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -81,8 +81,8 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./materialious/android/app/release/* - tag: ${{ steps.package-version.outputs.current-version}} - release_name: ${{ steps.package-version.outputs.current-version}} + tag: v${{ steps.package-version.outputs.current-version }} + release_name: v${{ steps.package-version.outputs.current-version }} overwrite: true file_glob: true draft: false From 108cf9490ce95f66e85d04458765d3c55091eac4 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 30 Nov 2024 13:20:23 +1300 Subject: [PATCH 3/5] Remove prefix in release name --- .github/workflows/prod-android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 5f9e00e8..be4bbd5d 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -82,7 +82,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./materialious/android/app/release/* tag: v${{ steps.package-version.outputs.current-version }} - release_name: v${{ steps.package-version.outputs.current-version }} + release_name: ${{ steps.package-version.outputs.current-version }} overwrite: true file_glob: true draft: false From 7905bdd290461eb494e5af74812794a7d61be9e8 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 30 Nov 2024 13:30:29 +1300 Subject: [PATCH 4/5] Update lock file --- materialious/electron/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 1e3f7755..91918e38 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.6.22", + "version": "1.6.23", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.6.22", + "version": "1.6.23", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", From 131888105a5caa8d3fad7b8f5509be8ec0eeb5c0 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 30 Nov 2024 13:44:50 +1300 Subject: [PATCH 5/5] Minor action fixes --- .github/workflows/prod-android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index be4bbd5d..0b6d0dbe 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -49,8 +49,8 @@ jobs: - name: Move files run: | - mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/app-release.apk - mv app/build/outputs/bundle/release/app-release.aab app/build/outputs/app-release.aab + mv app/build/outputs/apk/release/*.apk app/build/outputs/ + mv app/build/outputs/bundle/release/*.aab app/build/outputs/ - name: Sign App id: sign_app