From 0b9e0eb506eb983f7d94242b0b4939d6ab7c3bc2 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 26 Apr 2025 03:40:56 +1200 Subject: [PATCH 1/2] Update versions --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/materialious.metainfo.xml | 6 +++++- materialious/electron/package.json | 4 ++-- materialious/package.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index edffd541..b4e17bb7 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 103 - versionName "1.7.21" + versionCode 104 + versionName "1.7.22" 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/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 0f995f84..f86c319b 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -64,7 +64,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.7.22 + + https://github.com/Materialious/Materialious/releases/tag/1.7.21 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index ba6732cc..1b0685a8 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.7.21", + "version": "1.7.22", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", @@ -44,4 +44,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file diff --git a/materialious/package.json b/materialious/package.json index fb5a4533..2b938511 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.7.21", + "version": "1.7.22", "private": true, "scripts": { "dev": "vite dev", @@ -72,4 +72,4 @@ "terser": "^5.34.1", "youtubei.js": "^13.4.0" } -} +} \ No newline at end of file From 39379ba9a03af0be22061c150981e1177e03ca60 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 26 Apr 2025 03:45:51 +1200 Subject: [PATCH 2/2] Updated workflow node versions --- .github/workflows/prod-android.yml | 12 ++++++------ .github/workflows/prod-desktop.yml | 22 +++++++++++----------- .github/workflows/pull-android.yml | 10 +++++----- .github/workflows/pull-desktop.yml | 18 +++++++++--------- .github/workflows/pull-web.yml | 6 +++--- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 2fe6311b..46b65649 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -2,9 +2,9 @@ name: Build Android on: push: - branches: [ main ] + branches: [main] paths-ignore: - - '**/README.md' + - "**/README.md" workflow_dispatch: @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 20 + node-version: latest - name: Install modules run: cd ../ && npm install @@ -40,9 +40,9 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '17' - cache: 'gradle' + distribution: "zulu" + java-version: "17" + cache: "gradle" - name: Build App run: | diff --git a/.github/workflows/prod-desktop.yml b/.github/workflows/prod-desktop.yml index 739b1bea..2d32720f 100644 --- a/.github/workflows/prod-desktop.yml +++ b/.github/workflows/prod-desktop.yml @@ -2,9 +2,9 @@ name: Build desktop on: push: - branches: [ main ] + branches: [main] paths-ignore: - - '**/README.md' + - "**/README.md" workflow_dispatch: @@ -15,7 +15,7 @@ jobs: desktop-build: strategy: matrix: - node-version: [20] + node-version: [latest] runtime: - linux-x64 - linux-arm64 @@ -23,14 +23,14 @@ jobs: - osx-x64 include: - - runtime: linux-x64 - os: ubuntu-latest - - runtime: linux-arm64 - os: ubuntu-latest - - runtime: osx-x64 - os: macOS-latest - - runtime: win-x64 - os: windows-latest + - runtime: linux-x64 + os: ubuntu-latest + - runtime: linux-arm64 + os: ubuntu-latest + - runtime: osx-x64 + os: macOS-latest + - runtime: win-x64 + os: windows-latest runs-on: ${{ matrix.os }} diff --git a/.github/workflows/pull-android.yml b/.github/workflows/pull-android.yml index 56d86088..06659ba3 100644 --- a/.github/workflows/pull-android.yml +++ b/.github/workflows/pull-android.yml @@ -2,7 +2,7 @@ name: Check Android on: pull_request: - branches: [ "main" ] + branches: ["main"] permissions: contents: write @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 20 + node-version: latest - name: Install modules run: cd ../ && npm install @@ -36,9 +36,9 @@ jobs: - name: Setup JDK uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '17' - cache: 'gradle' + distribution: "zulu" + java-version: "17" + cache: "gradle" - name: Build App run: | diff --git a/.github/workflows/pull-desktop.yml b/.github/workflows/pull-desktop.yml index 3e9d1295..b5fb836b 100644 --- a/.github/workflows/pull-desktop.yml +++ b/.github/workflows/pull-desktop.yml @@ -13,7 +13,7 @@ jobs: desktop-check: strategy: matrix: - node-version: [20] + node-version: [latest] runtime: - linux-x64 - linux-arm64 @@ -21,14 +21,14 @@ jobs: - osx-x64 include: - - runtime: linux-x64 - os: ubuntu-latest - - runtime: linux-arm64 - os: ubuntu-latest - - runtime: osx-x64 - os: macOS-latest - - runtime: win-x64 - os: windows-latest + - runtime: linux-x64 + os: ubuntu-latest + - runtime: linux-arm64 + os: ubuntu-latest + - runtime: osx-x64 + os: macOS-latest + - runtime: win-x64 + os: windows-latest runs-on: ${{ matrix.os }} diff --git a/.github/workflows/pull-web.yml b/.github/workflows/pull-web.yml index ef746d9b..eda5b384 100644 --- a/.github/workflows/pull-web.yml +++ b/.github/workflows/pull-web.yml @@ -2,7 +2,7 @@ name: Check web on: pull_request: - branches: [ "main" ] + branches: ["main"] jobs: web-check: @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: latest - name: Install modules run: npm install - name: Check linting run: npm run check - name: Attempt to build codebase - run: npm run build \ No newline at end of file + run: npm run build