enable macOS builds again

mrquantumoff · Jul 4, 2024 · 7070984 · 7070984
1 parent 7c608f3
commit 7070984
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 37 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,34 +83,34 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: |
             GNULinuxBuild.tar.gz
-  # release-macos:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       platform: [macos-latest]
-  #   runs-on: ${{matrix.platform}}
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v2
-  #     - name: Install flutter
-  #       uses: subosito/flutter-action@v2
-  #       with:
-  #         channel: "stable"
-  #     - name: Generate locales
-  #       run: flutter gen-l10n
-  #     # - name: Build on macOS
-  #     #   if: matrix.platform == 'macos-latest'
-  #     #   run: |
-  #     #     flutter pub get
-  #     #     flutter build macos --release --split-debug-info --obfuscate --dart-define QUADRANT_QNT_API_KEY='${{secrets.QUADRANT_QNT_API_KEY}}' --dart-define ETERNAL_API_KEY='${{ secrets.ETERNAL_API_KEY }}'
-  #     #     tar -czvf macOSBuild.tar.gz build/macos/Build/Products/Release/Quadrant.app
-  #     #     # For future use
-  #     #     # pkgbuild --install-location /Applications --component "./build/macos/Build/Products/Release/Minecraft Modpack Manager Reborn.app" ./mcmodpackmanagerMacOS.pkg --identifier dev.mrquantumoff.mcmodpackmanager
-  #     # - name: Upload the macOS build
-  #     #   if: matrix.platform == 'macos-latest'
-  #     #   uses: softprops/action-gh-release@v1
-  #     #   with:
-  #     #     token: ${{ secrets.GITHUB_TOKEN }}
-  #     #     files: |
-  #     #       macOSBuild.tar.gz
-  #     #       LICENSE
+  release-macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [macos-latest]
+    runs-on: ${{matrix.platform}}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Install flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+      - name: Generate locales
+        run: flutter gen-l10n
+      - name: Build on macOS
+        if: matrix.platform == 'macos-latest'
+        run: |
+          flutter pub get
+          flutter build macos --release --split-debug-info --obfuscate --dart-define QUADRANT_OAUTH2_CLIENT_SECRET='${{secrets.CLIENT_SECRET}}' --dart-define QUADRANT_OAUTH2_CLIENT_ID='${{secrets.CLIENT_ID}}' --dart-define QUADRANT_QNT_API_KEY='${{secrets.QUADRANT_QNT_API_KEY}}' --dart-define ETERNAL_API_KEY='${{ secrets.ETERNAL_API_KEY }}'
+          tar -czvf macOSBuild.tar.gz build/macos/Build/Products/Release/Quadrant.app
+          # For future use
+          # pkgbuild --install-location /Applications --component "./build/macos/Build/Products/Release/Minecraft Modpack Manager Reborn.app" ./mcmodpackmanagerMacOS.pkg --identifier dev.mrquantumoff.mcmodpackmanager
+      - name: Upload the macOS build
+        if: matrix.platform == 'macos-latest'
+        uses: softprops/action-gh-release@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            macOSBuild.tar.gz
+            LICENSE
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@
         <img width="187" src="https://get.microsoft.com/images/en-us%20light.svg" alt="Download on Microsoft Store" />
     </a>
 
-### [Grab the latest build manually (Linux/Windows)](https://github.com/mrquantumoff/quadrant/releases/latest)
+### [Grab the latest build manually (Linux/Windows/macOS (untested))](https://github.com/mrquantumoff/quadrant/releases/latest)
 
 </div>
 
@@ -49,9 +49,10 @@
 > ## If you install the app from the Microsoft Store, make sure you have the .minecraft folder already created, or else you might have to follow the tip below!
 
 > [!TIP]
+>
 > ## If some of the app's functionality doesn't work properly on Windows, try enabling developer mode in the system settings and/or reinstalling the app from microsoft store.
-> ## If you can't apply your Quadrant modpack, try removing the mods folder manually.
 >
+> ## If you can't apply your Quadrant modpack, try removing the mods folder manually.
 
 > [!WARNING]
 >
@@ -62,7 +63,7 @@
 > ## Before requesting to the delete the data collected by the app, please be sure that you are using the latest version.
 
 > [!TIP]
-> 
+>
 > #### THIS ONLY APPLIES TO APP VERSIONS BEFORE v24.2.0. If CurseForge protocol handler doesn't work properly you can easily use [this registry fix](https://github.com/mrquantumoff/quadrant/raw/master/msstorefix.reg)
 
 > [!TIP]

diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = quadrant
 PRODUCT_BUNDLE_IDENTIFIER = dev.mrquantumoff.mcmodpackmanager_reborn
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2023 Demir Yerli, All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2024 Demir Yerli, All rights reserved.
diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist
@@ -38,7 +38,7 @@
 				<key> CFBundleURLSchemes</key>
 				<array>
 					<string>curseforge</string>
-					<string>mcmodpackmanager</string>
+					<string>quadrant</string>
 				</array>
 			</dict>
 		</array>

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: quadrant
 description: Manage your modpacks and mods with ease.
 publish_to: 'none'
 
-version: 24.7.0+2
+version: 24.7.0+3
 
 environment:
   sdk: '>=3.0.0 <4.0.0'