Merge pull request #675 from Materialious/update/1.6.18

Update/1.6.18

.github/workflows/prod-desktop.yml

@@ -29,10 +29,6 @@ jobs:
           os: macOS-latest
         - runtime: win-x64
           os: windows-latest
-        - runtime: linux-arm64
-          os: ubuntu-latest
-        - runtime: win-arm64
-          os: windows-latest
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/pull-desktop.yml

@@ -26,10 +26,7 @@ jobs:
             os: macOS-latest
           - runtime: win-x64
             os: windows-latest
-          - runtime: linux-arm64
-            os: ubuntu-latest
-          - runtime: win-arm64
-            os: windows-latest
+
 
     runs-on: ${{ matrix.os }}
 

materialious/android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 68
-        versionName "1.6.17"
+        versionCode 69
+        versionName "1.6.18"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

materialious/electron/electron-builder.config.json

@@ -1,5 +1,6 @@
 {
   "appId": "us.materialio.app",
+  "artifactName": "${productName}-${version}-${platform}-${arch}.${ext}",
   "directories": {
     "buildResources": "resources"
   },
@@ -25,10 +26,34 @@
   },
   "win": {
     "target": [
-      "nsis",
-      "portable",
-      "7z",
-      "zip"
+      {
+        "target": "nsis",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "portable",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "7z",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "zip",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      }
     ]
   },
   "mac": {
@@ -37,12 +62,41 @@
   },
   "linux": {
     "target": [
-      "deb",
-      "zip",
-      "7z",
-      "rpm",
-      "AppImage",
-      "zip"
+      {
+        "target": "deb",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "zip",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "7z",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "rpm",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      {
+        "target": "AppImage",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      }
     ],
     "category": "AudioVideo"
   },

materialious/electron/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "Materialious",
-	"version": "1.6.16",
+	"version": "1.6.18",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "Materialious",
-			"version": "1.6.16",
+			"version": "1.6.18",
 			"license": "MIT",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.0",

materialious/electron/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.6.17",
+	"version": "1.6.18",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",

materialious/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "materialious",
-	"version": "1.6.16",
+	"version": "1.6.18",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "materialious",
-			"version": "1.6.16",
+			"version": "1.6.18",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.1",
 				"@capacitor/android": "6.1.2",

materialious/package.json

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

update_versions.py

@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.6.17"
+LATEST_VERSION = "1.6.18"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")