diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21838ef4..5e8ae8dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build Flutter App +name: Build on: workflow_dispatch: @@ -262,21 +262,23 @@ jobs: echo "Verifying notarization..." xcrun stapler validate "$APP_PATH" - - name: Create ZIP + - name: Create DMG run: | - cd build/macos/Build/Products/Release - ditto -c -k --sequesterRsrc --keepParent plezy.app $GITHUB_WORKSPACE/plezy-macos.zip + mkdir -p dmg-staging + cp -R build/macos/Build/Products/Release/plezy.app dmg-staging/ + ln -s /Applications dmg-staging/Applications + hdiutil create -format ULMO -srcfolder dmg-staging -volname "Plezy" plezy-macos.dmg - - name: Attest macOS ZIP + - name: Attest macOS DMG uses: actions/attest-build-provenance@v2 with: - subject-path: plezy-macos.zip + subject-path: plezy-macos.dmg - - name: Upload macOS ZIP + - name: Upload macOS DMG uses: actions/upload-artifact@v4 with: - name: macos-zip - path: plezy-macos.zip + name: macos-dmg + path: plezy-macos.dmg build-windows: runs-on: windows-latest @@ -315,14 +317,14 @@ jobs: uses: actions/attest-build-provenance@v2 with: subject-path: | - plezy-windows-portable.zip + plezy-windows-portable.7z plezy-windows-installer.exe - name: Upload Portable Archive uses: actions/upload-artifact@v4 with: name: windows-portable - path: plezy-windows-portable.zip + path: plezy-windows-portable.7z - name: Upload Installer uses: actions/upload-artifact@v4 @@ -388,14 +390,7 @@ jobs: path: plezy-linux.tar.gz create-release: - needs: - [ - build-android, - build-ios, - build-macos, - build-windows, - build-linux, - ] + needs: [build-android, build-ios, build-macos, build-windows, build-linux] runs-on: ubuntu-latest permissions: contents: write @@ -416,8 +411,8 @@ jobs: artifacts/android-apk/plezy-android-armeabi-v7a.tar.gz artifacts/android-apk/plezy-android-x86_64.tar.gz artifacts/ios-ipa/plezy-ios.ipa - artifacts/macos-zip/plezy-macos.zip - artifacts/windows-portable/plezy-windows-portable.zip + artifacts/macos-dmg/plezy-macos.dmg + artifacts/windows-portable/plezy-windows-portable.7z artifacts/windows-installer/plezy-windows-installer.exe artifacts/linux-app/plezy-linux.tar.gz draft: true diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 79f5e659..e212c3a6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -20,8 +20,6 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - share_plus (0.0.1): - - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -72,7 +70,6 @@ DEPENDENCIES: - os_media_controls (from `.symlinks/plugins/os_media_controls/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`) @@ -106,8 +103,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" - share_plus: - :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqflite_darwin: @@ -132,7 +127,6 @@ SPEC CHECKSUMS: os_media_controls: 86dceab6245a5325af90fc0fdebe243c42d789b4 package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 604097d9..6321eca2 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,7 +17,6 @@ import os_media_controls import package_info_plus import path_provider_foundation import screen_retriever_macos -import share_plus import shared_preferences_foundation import sqflite_darwin import sqlite3_flutter_libs @@ -38,7 +37,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin")) - SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 89499d31..36535ff8 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -28,8 +28,6 @@ PODS: - FlutterMacOS - screen_retriever_macos (0.0.1): - FlutterMacOS - - share_plus (0.0.1): - - FlutterMacOS - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -83,7 +81,6 @@ DEPENDENCIES: - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`) - - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`) - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`) @@ -124,8 +121,6 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin screen_retriever_macos: :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos - share_plus: - :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos shared_preferences_foundation: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin sqflite_darwin: @@ -154,7 +149,6 @@ SPEC CHECKSUMS: package_info_plus: f0052d280d17aa382b932f399edf32507174e870 path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f - share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 sqlite3: 8d708bc63e9f4ce48f0ad9d6269e478c5ced1d9b diff --git a/pubspec.lock b/pubspec.lock index 5243f5c7..56619830 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1113,22 +1113,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" - share_plus: - dependency: "direct main" - description: - name: share_plus - sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da - url: "https://pub.dev" - source: hosted - version: "10.1.4" - share_plus_platform_interface: - dependency: transitive - description: - name: share_plus_platform_interface - sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b - url: "https://pub.dev" - source: hosted - version: "5.0.2" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 7e6a20cc..745c00f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,7 +46,6 @@ dependencies: saf_stream: ^0.12.2 material_symbols_icons: ^4.2892.0 peerdart: ^0.5.6 - share_plus: ^10.0.0 in_app_review: ^2.0.11 dart_discord_presence: ^1.1.0 diff --git a/windows/build-installer.ps1 b/windows/build-installer.ps1 index 282a38ab..ae3b23ca 100644 --- a/windows/build-installer.ps1 +++ b/windows/build-installer.ps1 @@ -18,7 +18,7 @@ Set-Location $ProjectRoot # Define paths $BuildDir = "build\windows\x64\runner\Release" -$PortableZip = Join-Path (Resolve-Path $OutputDir) "plezy-windows-portable.zip" +$PortableZip = Join-Path (Resolve-Path $OutputDir) "plezy-windows-portable.7z" $InstallerExe = Join-Path (Resolve-Path $OutputDir) "plezy-windows-installer.exe" $SetupScript = "setup.iss" @@ -30,6 +30,25 @@ if (-not (Test-Path $BuildDir)) { Write-Host "Found build at: $BuildDir" -ForegroundColor Green +# Check for 7-Zip +Write-Host "`nChecking for 7-Zip..." -ForegroundColor Cyan +if (-not (Get-Command 7z -ErrorAction SilentlyContinue)) { + Write-Host "7-Zip not found in PATH. Installing via Chocolatey..." -ForegroundColor Yellow + + if (-not (Get-Command choco -ErrorAction SilentlyContinue)) { + Write-Error "Chocolatey is not installed. Please install it from https://chocolatey.org/install" + exit 1 + } + + choco install 7zip -y + refreshenv + + if (-not (Get-Command 7z -ErrorAction SilentlyContinue)) { + Write-Error "Failed to install 7-Zip" + exit 1 + } +} + # Create Portable Archive Write-Host "`nCreating portable archive..." -ForegroundColor Cyan Push-Location $BuildDir @@ -37,7 +56,7 @@ try { if (Test-Path $PortableZip) { Remove-Item $PortableZip -Force } - Compress-Archive -Path * -DestinationPath $PortableZip + 7z a -mx=9 $PortableZip * Write-Host "Created: $PortableZip" -ForegroundColor Green } finally { Pop-Location diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index dc365368..fa4e381b 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -30,8 +29,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("OsMediaControlsPluginCApi")); ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); - SharePlusWindowsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 9a4896ab..3f8229cf 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST hotkey_manager_windows os_media_controls screen_retriever_windows - share_plus sqlite3_flutter_libs url_launcher_windows window_manager