Merge pull request #726 from Materialious/update/1.6.23

Update/1.6.23

.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
@@ -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
@@ -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: ${{ steps.package-version.outputs.current-version }}
           overwrite: true
           file_glob: true
           draft: false

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 {

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",

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",

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",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.22",
+	"version": "1.6.23",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

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")