Merge pull request #693 from Materialious/update/1.6.20

Update/1.6.20

.github/workflows/prod-desktop.yml

@@ -58,20 +58,20 @@ 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: Install snapcraft
         if: matrix.runtime == 'linux-x64'
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_LOGIN }}
-        with:
-          snap: ./materialious/electron/dist/*.snap
-          release: stable
+        run: sudo snap install snapcraft --classic
+
+      - name: Set up snapcraft environment variables
+        run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAPCRAFT_LOGIN }}" >> $GITHUB_ENV
+        shell: bash
+        if: matrix.runtime == 'linux-x64'
+
+      - name: Build desktop packages
+        run: cd ./materialious/electron && npm run electron:make

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.

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": [

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

materialious/package.json

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

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