From 3d65dfc397cfde484f1e7e3b67c51802e963ab03 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Tue, 29 Oct 2024 23:21:32 +1300
Subject: [PATCH] Update prod desktop workflow

---
 .github/workflows/prod-desktop.yml            | 19 +++++++++---------
 materialious/android/app/build.gradle         |  4 ++--
 .../electron/electron-builder.config.json     | 20 +++++++++++++------
 materialious/electron/package.json            |  2 +-
 materialious/package.json                     |  2 +-
 update_versions.py                            |  2 +-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml
index a80ffaf0..d3181b00 100644
--- a/.github/workflows/prod-desktop.yml
+++ b/.github/workflows/prod-desktop.yml
@@ -58,20 +58,19 @@ jobs:
         run: echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
         shell: bash
         if: runner.os != 'Windows'
-            
+
       - name: Set up environment variables
         run: echo GH_TOKEN=${{ secrets.GITHUB_TOKEN }} >> $env:GITHUB_ENV
         shell: powershell
         if: runner.os == 'Windows'
 
-      - name: Build desktop packages
-        run: cd ./materialious/electron && npm run electron:make
-
-      - name: Upload Snap to Snapcraft
+      - name: Setup Snapcraft
         if: matrix.runtime == 'linux-x64'
-        uses: snapcore/action-publish@v1
+        run: |
+          sudo snap install snapcraft --classic
+          echo "$SNAP_TOKEN" | snapcraft login --with -
         env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_LOGIN }}
-        with:
-          snap: ./materialious/electron/dist/*.snap
-          release: stable
\ No newline at end of file
+          SNAP_TOKEN: ${{ secrets.SNAPCRAFT_LOGIN }} 
+
+      - name: Build desktop packages
+        run: cd ./materialious/electron && npm run electron:make
\ No newline at end of file
diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index abf28e0f..78aa8960 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 70
-        versionName "1.6.19"
+        versionCode 71
+        versionName "1.6.20"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/materialious/electron/electron-builder.config.json b/materialious/electron/electron-builder.config.json
index 9b484fb4..dfd1e607 100644
--- a/materialious/electron/electron-builder.config.json
+++ b/materialious/electron/electron-builder.config.json
@@ -4,11 +4,19 @@
   "directories": {
     "buildResources": "resources"
   },
-  "publish": {
-    "provider": "github",
-    "vPrefixedTagName": false,
-    "releaseType": "release"
-  },
+  "publish": [
+    {
+      "provider": "github",
+      "vPrefixedTagName": false,
+      "releaseType": "release"
+    },
+    {
+      "provider": "snapStore",
+      "channels": [
+        "stable"
+      ]
+    }
+  ],
   "icon": "appIcon.png",
   "files": [
     "assets/**/*",
@@ -104,7 +112,7 @@
         ]
       }
     ],
-    "category": "AudioVideo"
+    "category": "GNOME;GTK;AudioVideo;Network;Utility;"
   },
   "rpm": {
     "fpm": [
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index fef380e2..f1c6c59c 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.6.19",
+	"version": "1.6.20",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
diff --git a/materialious/package.json b/materialious/package.json
index f3bb4474..1df19659 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.19",
+	"version": "1.6.20",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
diff --git a/update_versions.py b/update_versions.py
index 2dbdbcc6..057e781f 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.6.19"
+LATEST_VERSION = "1.6.20"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")