chore: Merge upstream/main into dev (preserve downstream zipalign & rip-lib features)

Author: AzyrRuthless

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,12 +6,12 @@ body:
   - type: markdown
     attributes:
       value: |
-        # Morphe CLI bug report
+        # Morphe Desktop bug report
 
         Before creating a new bug report, please keep the following in mind:
 
-        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/MorpheApp/morphe-cli/issues?q=label%3A%22Bug+report%22).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/MorpheApp/morphe-cli/blob/main/CONTRIBUTING.md).
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/MorpheApp/morphe-desktop/issues?q=label%3A%22Bug+report%22).
+        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/MorpheApp/morphe-desktop/blob/main/CONTRIBUTING.md).
   - type: textarea
     attributes:
       label: Bug description

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -6,12 +6,12 @@ body:
   - type: markdown
     attributes:
       value: |
-        # Morphe CLI feature request
+        # Morphe Desktop feature request
 
         Before creating a new feature request, please keep the following in mind:
 
-        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/MorpheApp/morphe-cli/issues?q=label%3A%22Feature+request%22).
-        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/MorpheApp/morphe-cli//blob/main/CONTRIBUTING.md).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/MorpheApp/morphe-desktop/issues?q=label%3A%22Feature+request%22).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/MorpheApp/morphe-desktop/blob/main/CONTRIBUTING.md).
   - type: textarea
     attributes:
       label: Feature description

.github/workflows/build_pull_request.yml

@@ -17,15 +17,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5.6.0
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1
@@ -38,7 +38,7 @@ jobs:
 
       - name: Upload artifacts
         if: matrix.os == 'ubuntu-latest'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           archive: false
-          path: build/libs/morphe-cli-*-all.jar
+          path: build/libs/morphe-desktop-*-all.jar

.github/workflows/open_pull_request.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Open pull request
         uses: repo-sync/pull-request@v2

.github/workflows/release.yml

@@ -15,18 +15,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           # Make sure the release step uses its own credentials:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v3
+      - name: Clean
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew clean --no-daemon
 
       - name: Setup Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: "lts/*"
           cache: 'npm'

.releaserc

@@ -32,7 +32,7 @@
       {
         "assets": [
           {
-            "path": "build/libs/morphe-cli*-all.jar"
+            "path": "build/libs/morphe-desktop*-all.jar"
           }
         ],
         successComment: false

.run/Morphe Desktop.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Morphe Desktop" type="Application" factoryName="Application">
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="MAIN_CLASS_NAME" value="app.morphe.MorpheLauncherKt" />
+    <module name="morphe-desktop.main" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>