From e1dad8fd6a5b0aecc90eacf2dfab67b02fa4db0f Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sat, 30 Nov 2024 13:18:31 +1300
Subject: [PATCH] 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")