Merge tag '3.0.0' into MaaTools

hguandl · Jul 2, 2024 · d0d6388 · d0d6388
2 parents e9b4bf5 + a9cd5ff
commit d0d6388
Show file tree

Hide file tree

Showing 56 changed files with 2,294 additions and 805 deletions.
diff --git a/.github/ISSUE_TEMPLATE/APP-SUPPORT.yml b/.github/ISSUE_TEMPLATE/APP-SUPPORT.yml
@@ -34,6 +34,31 @@ body:
       label: Crash log
       description: Copy and paste in any relevant crash logs in plain text.
       render: shell
+  - type: dropdown
+    id: pc-version
+    attributes:
+      label: What version of PlayCover are you using?
+      options:
+        - "3.0.0 beta 2"
+        - "3.0.0 beta 1"
+        - 2.0.5
+        - 2.0.4
+        - "Nightly/beta (please specify build number)"
+        - "Other (please specify)"
+    validations:
+        required: true
+  - type: dropdown
+    id: mac-version
+    attributes:
+      label: What version of macOS are you using?
+      options:
+        - "Sonoma (macOS 14)"
+        - "Ventura (macOS 13)"
+        - "Monterey (macOS 12)"
+        - "macOS beta (please state the specific version)"
+        - "Other (please specify)"
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Issue Language

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -35,18 +35,24 @@ body:
     attributes:
       label: What version of PlayCover are you using?
       options:
-        - Nightly/beta
+        - "3.0.0 beta 2"
+        - "3.0.0 beta 1"
+        - 2.0.5
         - 2.0.4
+        - "Nightly/beta (please specify build number)"
+        - "Other (please specify)"
     validations:
         required: true
   - type: dropdown
     id: mac-version
     attributes:
       label: What version of macOS are you using?
       options:
-        - "Monterey (macOS 12)"
+        - "Sonoma (macOS 14)"
         - "Ventura (macOS 13)"
-        - macOS beta (please state the specific version)
+        - "Monterey (macOS 12)"
+        - "macOS beta (please state the specific version)"
+        - "Other (please specify)"
     validations:
       required: true
   - type: checkboxes

diff --git a/.github/ISSUE_TEMPLATE/GAME-SUPPORT.yml b/.github/ISSUE_TEMPLATE/GAME-SUPPORT.yml
@@ -34,6 +34,31 @@ body:
       label: Crash log
       description: Copy and paste in any relevant crash logs in plain text.
       render: shell
+  - type: dropdown
+    id: pc-version
+    attributes:
+      label: What version of PlayCover are you using?
+      options:
+        - "3.0.0 beta 2"
+        - "3.0.0 beta 1"
+        - 2.0.5
+        - 2.0.4
+        - "Nightly/beta (please specify build number)"
+        - "Other (please specify)"
+    validations:
+        required: true
+  - type: dropdown
+    id: mac-version
+    attributes:
+      label: What version of macOS are you using?
+      options:
+        - "Sonoma (macOS 14)"
+        - "Ventura (macOS 13)"
+        - "Monterey (macOS 12)"
+        - "macOS beta (please state the specific version)"
+        - "Other (please specify)"
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Issue Language

diff --git a/.github/workflows/1.build_release.yml b/.github/workflows/1.build_release.yml
@@ -1,26 +1,43 @@
 name: Build & Release macOS App
 on:
+  workflow_dispatch:
+    tags:
+          - "*"
   push:
     tags:
       - "*"
 env:
   CI: true
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
+    env:
+      GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/[email protected]
+
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
 
       - name: Get the version
         id: tag_version
-        run: echo ::set-output name=TAG_NAME::${GITHUB_REF/refs\/tags\//}
+        run: echo "TAG_NAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Install dependencies
         shell: bash
         run: |
-          brew install graphicsmagick imagemagick
+          brew install graphicsmagick imagemagick swiftlint
+          gem install fastlane
           bundle install
+          pip install setuptools
           npm install --global create-dmg
 
       - name: Fastlane Release
@@ -42,27 +59,22 @@ jobs:
         run: |
           create-dmg ./output/PlayCover.app ./output
           mv ./output/*.dmg ./output/PlayCover_${{ env.TAG_NAME }}.dmg
-        env:
-          TAG_NAME: ${{ steps.tag_version.outputs.TAG_NAME }}
 
       - name: Notarize DMG
+        continue-on-error: true
         shell: bash
         run: |
           fastlane notarize_dmg package:output/PlayCover_${{ env.TAG_NAME }}.dmg
-        env:
-          TAG_NAME: ${{ steps.tag_version.outputs.TAG_NAME }}
 
       - name: Clean Up
         shell: bash
         run: rm apikey.json
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: PlayCover_${{ env.TAG_NAME }}.dmg
           path: output/PlayCover_${{ env.TAG_NAME }}.dmg
-        env:
-          TAG_NAME: ${{ steps.tag_version.outputs.TAG_NAME }}
 
       - name: Release
         if: startsWith(github.ref, 'refs/tags/')
@@ -71,5 +83,3 @@ jobs:
           draft: true
           files: |
             output/PlayCover_${{ env.TAG_NAME }}.dmg
-        env:
-          TAG_NAME: ${{ steps.tag_version.outputs.TAG_NAME }}
diff --git a/.github/workflows/2.nightly_release.yml b/.github/workflows/2.nightly_release.yml
@@ -7,16 +7,30 @@ env:
   CI: true
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-14
+    env:
+      GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/[email protected]
+
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
 
       - name: Install dependencies
         shell: bash
         run: |
-          brew install graphicsmagick imagemagick
+          brew install graphicsmagick imagemagick swiftlint
+          gem install fastlane
           bundle install
+          pip install setuptools
           npm install --global create-dmg
 
       - name: Set build number
@@ -55,7 +69,7 @@ jobs:
         run: rm apikey.json
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: PlayCover_nightly_${{ github.run_number }}.dmg
           path: output/PlayCover_nightly_${{ github.run_number }}.dmg
diff --git a/.github/workflows/SwiftLint.yml b/.github/workflows/SwiftLint.yml
@@ -4,16 +4,15 @@ on:
   # Run on PR and push to every branch
   pull_request:
   push:
-  
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
   SwiftLint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/[email protected]
       - name: SwiftLint
         uses: norio-nomura/[email protected]
         with:

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -11,3 +11,7 @@ identifier_name:
 
 type_name:
   allowed_symbols: ['_']
+
+disabled_rules:
+  # see https://github.com/realm/SwiftLint/issues/5263
+  - non_optional_string_data_conversion