From 648ed898d98aa2d7513b09346344dbd9c49e39d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:23:10 +0200 Subject: [PATCH] Bump the pub group across 1 directory with 25 updates (#279) * Bump the pub group across 1 directory with 25 updates Bumps the pub group with 23 updates in the /app directory: | Package | From | To | | --- | --- | --- | | [carousel_slider](https://github.com/serenader2014/flutter_carousel_slider) | `5.0.0` | `5.1.1` | | [file_picker](https://github.com/miguelpruivo/flutter_file_picker) | `10.1.2` | `10.2.0` | | [flutter_launcher_icons](https://github.com/fluttercommunity/flutter_launcher_icons) | `0.14.3` | `0.14.4` | | [flutter_lints](https://github.com/flutter/packages/tree/main/packages) | `5.0.0` | `6.0.0` | | [flutter_markdown](https://github.com/flutter/packages/tree/main/packages) | `0.7.6` | `0.7.7+1` | | [flutter_native_splash](https://github.com/jonbhanson/flutter_native_splash) | `2.4.5` | `2.4.6` | | [html](https://github.com/dart-lang/tools/tree/main/pkgs) | `0.15.5` | `0.15.6` | | [http](https://github.com/dart-lang/http/tree/master/pkgs) | `1.3.0` | `1.4.0` | | [intl](https://github.com/dart-lang/i18n/tree/main/pkgs) | `0.19.0` | `0.20.2` | | [just_audio](https://github.com/ryanheise/just_audio) | `0.9.46` | `0.10.4` | | [just_audio_background](https://github.com/ryanheise/just_audio) | `0.0.1-beta.15` | `0.0.1-beta.17` | | [just_audio_media_kit](https://github.com/Pato05/just_audio_media_kit) | `2.0.6` | `2.1.0` | | [media_kit_libs_video](https://github.com/media-kit/media-kit) | `1.0.5` | `1.0.6` | | [media_kit_video](https://github.com/media-kit/media-kit) | `1.2.5` | `1.3.0` | | [msix](https://github.com/YehudaKremer/msix) | `3.16.8` | `3.16.9` | | [provider](https://github.com/rrousselGit/provider) | `6.1.2` | `6.1.5` | | [purchases_flutter](https://github.com/RevenueCat/purchases-flutter) | `8.6.1` | `9.1.0` | | [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) | `2.5.2` | `2.5.3` | | [sign_in_with_apple](https://github.com/aboutyou/dart_packages) | `6.1.4` | `7.0.1` | | [supabase_flutter](https://github.com/supabase/supabase-flutter/tree/main/packages) | `2.8.4` | `2.9.1` | | [url_launcher](https://github.com/flutter/packages/tree/main/packages/url_launcher) | `6.3.1` | `6.3.2` | | [window_manager](https://github.com/leanflutter/window_manager) | `0.4.3` | `0.5.1` | | [youtube_explode_dart](https://github.com/Hexer10/youtube_explode_dart) | `2.3.10` | `2.5.1` | Updates `carousel_slider` from 5.0.0 to 5.1.1 - [Release notes](https://github.com/serenader2014/flutter_carousel_slider/releases) - [Changelog](https://github.com/serenader2014/flutter_carousel_slider/blob/master/CHANGELOG.md) - [Commits](https://github.com/serenader2014/flutter_carousel_slider/commits) Updates `file_picker` from 10.1.2 to 10.2.0 - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/commits) Updates `flutter_launcher_icons` from 0.14.3 to 0.14.4 - [Release notes](https://github.com/fluttercommunity/flutter_launcher_icons/releases) - [Changelog](https://github.com/fluttercommunity/flutter_launcher_icons/blob/master/CHANGELOG.md) - [Commits](https://github.com/fluttercommunity/flutter_launcher_icons/commits/v0.14.4) Updates `flutter_lints` from 5.0.0 to 6.0.0 - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/flutter_lints-v6.0.0/packages) Updates `flutter_markdown` from 0.7.6 to 0.7.7+1 - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/flutter_markdown-v0.7.7/packages) Updates `flutter_native_splash` from 2.4.5 to 2.4.6 - [Release notes](https://github.com/jonbhanson/flutter_native_splash/releases) - [Changelog](https://github.com/jonbhanson/flutter_native_splash/blob/master/CHANGELOG.md) - [Commits](https://github.com/jonbhanson/flutter_native_splash/compare/v2.4.5...v2.4.6) Updates `html` from 0.15.5 to 0.15.6 - [Release notes](https://github.com/dart-lang/tools/releases) - [Commits](https://github.com/dart-lang/tools/commits/html-v0.15.6/pkgs) Updates `http` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/dart-lang/http/releases) - [Commits](https://github.com/dart-lang/http/commits/HEAD/pkgs) Updates `intl` from 0.19.0 to 0.20.2 - [Release notes](https://github.com/dart-lang/i18n/releases) - [Commits](https://github.com/dart-lang/i18n/commits/intl-v0.20.2/pkgs) Updates `just_audio` from 0.9.46 to 0.10.4 - [Release notes](https://github.com/ryanheise/just_audio/releases) - [Commits](https://github.com/ryanheise/just_audio/compare/just_audio-v0.9.46...just_audio-v0.10.4) Updates `just_audio_background` from 0.0.1-beta.15 to 0.0.1-beta.17 - [Release notes](https://github.com/ryanheise/just_audio/releases) - [Commits](https://github.com/ryanheise/just_audio/compare/just_audio_background-v0.0.1-beta.15...just_audio_background-v0.0.1-beta.17) Updates `just_audio_media_kit` from 2.0.6 to 2.1.0 - [Changelog](https://github.com/Pato05/just_audio_media_kit/blob/main/CHANGELOG.md) - [Commits](https://github.com/Pato05/just_audio_media_kit/compare/v2.0.6...v2.1.0) Updates `media_kit` from 1.1.11 to 1.2.0 - [Release notes](https://github.com/media-kit/media-kit/releases) - [Changelog](https://github.com/media-kit/media-kit/blob/main/CHANGELOG.md) - [Commits](https://github.com/media-kit/media-kit/commits/media_kit_video-v1.2.0) Updates `media_kit_libs_video` from 1.0.5 to 1.0.6 - [Release notes](https://github.com/media-kit/media-kit/releases) - [Changelog](https://github.com/media-kit/media-kit/blob/main/CHANGELOG.md) - [Commits](https://github.com/media-kit/media-kit/compare/media_kit_libs_ios_audio-v1.0.5...media_kit_libs_macos_audio-v1.0.6) Updates `media_kit_video` from 1.2.5 to 1.3.0 - [Release notes](https://github.com/media-kit/media-kit/releases) - [Changelog](https://github.com/media-kit/media-kit/blob/main/CHANGELOG.md) - [Commits](https://github.com/media-kit/media-kit/commits/media_kit_libs_android_audio-v1.3.0) Updates `msix` from 3.16.8 to 3.16.9 - [Release notes](https://github.com/YehudaKremer/msix/releases) - [Changelog](https://github.com/YehudaKremer/msix/blob/main/CHANGELOG.md) - [Commits](https://github.com/YehudaKremer/msix/compare/v3.16.8...v3.16.9) Updates `provider` from 6.1.2 to 6.1.5 - [Commits](https://github.com/rrousselGit/provider/compare/provider-v6.1.2...provider-v6.1.5) Updates `purchases_flutter` from 8.6.1 to 9.1.0 - [Release notes](https://github.com/RevenueCat/purchases-flutter/releases) - [Changelog](https://github.com/RevenueCat/purchases-flutter/blob/main/CHANGELOG.md) - [Commits](https://github.com/RevenueCat/purchases-flutter/compare/8.6.1...9.1.0) Updates `shared_preferences` from 2.5.2 to 2.5.3 - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.5.3/packages/shared_preferences) Updates `sign_in_with_apple` from 6.1.4 to 7.0.1 - [Release notes](https://github.com/aboutyou/dart_packages/releases) - [Commits](https://github.com/aboutyou/dart_packages/commits) Updates `supabase_flutter` from 2.8.4 to 2.9.1 - [Changelog](https://github.com/supabase/supabase-flutter/blob/main/CHANGELOG.md) - [Commits](https://github.com/supabase/supabase-flutter/commits/HEAD/packages) Updates `timeago` from 3.7.0 to 3.7.1 - [Commits](https://github.com/andresaraujo/timeago.dart/commits) Updates `url_launcher` from 6.3.1 to 6.3.2 - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/url_launcher-v6.3.2/packages/url_launcher) Updates `window_manager` from 0.4.3 to 0.5.1 - [Release notes](https://github.com/leanflutter/window_manager/releases) - [Commits](https://github.com/leanflutter/window_manager/commits) Updates `youtube_explode_dart` from 2.3.10 to 2.5.1 - [Release notes](https://github.com/Hexer10/youtube_explode_dart/releases) - [Changelog](https://github.com/Hexer10/youtube_explode_dart/blob/master/CHANGELOG.md) - [Commits](https://github.com/Hexer10/youtube_explode_dart/compare/v2.3.10...v2.5.1) --- updated-dependencies: - dependency-name: carousel_slider dependency-version: 5.1.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: file_picker dependency-version: 10.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: flutter_launcher_icons dependency-version: 0.14.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: flutter_lints dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: pub - dependency-name: flutter_markdown dependency-version: 0.7.7+1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: flutter_native_splash dependency-version: 2.4.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: html dependency-version: 0.15.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: http dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: intl dependency-version: 0.20.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: just_audio dependency-version: 0.10.4 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: just_audio_background dependency-version: 0.0.1-beta.17 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: just_audio_media_kit dependency-version: 2.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: media_kit dependency-version: 1.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: media_kit_libs_video dependency-version: 1.0.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: media_kit_video dependency-version: 1.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: msix dependency-version: 3.16.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: provider dependency-version: 6.1.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: purchases_flutter dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: pub - dependency-name: shared_preferences dependency-version: 2.5.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: sign_in_with_apple dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: pub - dependency-name: supabase_flutter dependency-version: 2.9.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: timeago dependency-version: 3.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: url_launcher dependency-version: 6.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: pub - dependency-name: window_manager dependency-version: 0.5.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub - dependency-name: youtube_explode_dart dependency-version: 2.5.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: pub ... Signed-off-by: dependabot[bot] * Update Flutter Version to 3.32.7 - Update Flutter version to 3.32.7 - Enable Swift Package Manager for iOS and macOS --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ricoberger --- .github/workflows/continuous-delivery.yaml | 16 +- .github/workflows/continuous-integration.yaml | 2 +- app/ios/Podfile.lock | 97 +------ app/ios/Runner.xcodeproj/project.pbxproj | 20 ++ .../xcshareddata/swiftpm/Package.resolved | 60 ++++ .../xcshareddata/xcschemes/Runner.xcscheme | 20 ++ .../xcshareddata/swiftpm/Package.resolved | 60 ++++ app/lib/main.dart | 39 +-- .../item_piped/item_piped_video_web.dart | 3 +- .../item_youtube/item_youtube_video_web.dart | 3 +- .../premium/settings_premium_inapp.dart | 65 ++--- .../flutter/generated_plugin_registrant.cc | 4 + app/linux/flutter/generated_plugins.cmake | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 4 +- app/macos/Podfile.lock | 91 +----- app/macos/Runner.xcodeproj/project.pbxproj | 20 ++ .../xcshareddata/xcschemes/Runner.xcscheme | 18 ++ app/pubspec.lock | 274 ++++++++---------- app/pubspec.yaml | 48 +-- .../flutter/generated_plugin_registrant.cc | 6 +- app/windows/flutter/generated_plugins.cmake | 3 +- 21 files changed, 428 insertions(+), 427 deletions(-) create mode 100644 app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 app/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/continuous-delivery.yaml b/.github/workflows/continuous-delivery.yaml index 4ca68b0..43a3a96 100644 --- a/.github/workflows/continuous-delivery.yaml +++ b/.github/workflows/continuous-delivery.yaml @@ -187,7 +187,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -237,7 +237,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -251,6 +251,7 @@ jobs: - name: Build run: | flutter config --enable-macos-desktop + flutter config --enable-swift-package-manager FLUTTER_XCODE_CODE_SIGN_IDENTITY="" FLUTTER_XCODE_CODE_SIGNING_REQUIRED=NO flutter build macos --release --dart-define SUPABASE_URL=${{ secrets.SUPABASE_PROD_URL }} --dart-define SUPABASE_ANON_KEY=${{ secrets.SUPABASE_PROD_ANON_KEY }} --dart-define SUPABASE_SITE_URL=${{ secrets.SUPABASE_PROD_SITE_URL }} --dart-define GOOGLE_CLIENT_ID=${{ secrets.SUPABASE_PROD_GOOGLE_CLIENT_ID }} - name: Package @@ -306,7 +307,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -384,7 +385,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "master" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -448,7 +449,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -527,7 +528,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" @@ -541,6 +542,7 @@ jobs: - name: Build run: | flutter config --enable-ios + flutter config --enable-swift-package-manager flutter build ipa --no-codesign --release --dart-define SUPABASE_URL=${{ secrets.SUPABASE_PROD_URL }} --dart-define SUPABASE_ANON_KEY=${{ secrets.SUPABASE_PROD_ANON_KEY }} --dart-define SUPABASE_SITE_URL=${{ secrets.SUPABASE_PROD_SITE_URL }} --dart-define GOOGLE_CLIENT_ID=${{ secrets.SUPABASE_PROD_GOOGLE_CLIENT_ID }} # The "Android" job builds the Flutter Android app on every pull request. This @@ -566,7 +568,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index e968c46..ba33f46 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -24,7 +24,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.29.3" + flutter-version: "3.32.7" channel: "stable" cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index 6eea6e5..20ff0f4 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -1,72 +1,30 @@ PODS: - - app_links (0.0.2): - - Flutter - - audio_service (0.0.1): - - Flutter - - audio_session (0.0.1): - - Flutter - - file_picker (0.0.1): - - Flutter - Flutter (1.0.0) - - flutter_native_splash (2.4.3): - - Flutter - - just_audio (0.0.1): - - Flutter - - FlutterMacOS - media_kit_libs_ios_video (1.0.4): - Flutter - - media_kit_native_event_loop (1.0.0): - - Flutter - media_kit_video (0.0.1): - Flutter - - package_info_plus (0.4.5): + - purchases_flutter (9.1.0): - Flutter - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - - purchases_flutter (8.6.1): - - Flutter - - PurchasesHybridCommon (= 13.25.0) - - PurchasesHybridCommon (13.25.0): - - RevenueCat (= 5.19.0) - - RevenueCat (5.19.0) - - screen_brightness_ios (0.1.0): - - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS + - PurchasesHybridCommon (= 16.0.2) + - PurchasesHybridCommon (16.0.2): + - RevenueCat (= 5.33.1) + - RevenueCat (5.33.1) - sign_in_with_apple (0.0.1): - Flutter - sqflite (0.0.3): - Flutter - FlutterMacOS - - url_launcher_ios (0.0.1): - - Flutter - - volume_controller (0.0.1): - - Flutter - wakelock_plus (0.0.1): - Flutter DEPENDENCIES: - - app_links (from `.symlinks/plugins/app_links/ios`) - - audio_service (from `.symlinks/plugins/audio_service/ios`) - - audio_session (from `.symlinks/plugins/audio_session/ios`) - - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - - just_audio (from `.symlinks/plugins/just_audio/darwin`) - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`) - - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`) - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`) - - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) - sqflite (from `.symlinks/plugins/sqflite/darwin`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - volume_controller (from `.symlinks/plugins/volume_controller/ios`) - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) SPEC REPOS: @@ -75,69 +33,30 @@ SPEC REPOS: - RevenueCat EXTERNAL SOURCES: - app_links: - :path: ".symlinks/plugins/app_links/ios" - audio_service: - :path: ".symlinks/plugins/audio_service/ios" - audio_session: - :path: ".symlinks/plugins/audio_session/ios" - file_picker: - :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter - flutter_native_splash: - :path: ".symlinks/plugins/flutter_native_splash/ios" - just_audio: - :path: ".symlinks/plugins/just_audio/darwin" media_kit_libs_ios_video: :path: ".symlinks/plugins/media_kit_libs_ios_video/ios" - media_kit_native_event_loop: - :path: ".symlinks/plugins/media_kit_native_event_loop/ios" media_kit_video: :path: ".symlinks/plugins/media_kit_video/ios" - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/darwin" purchases_flutter: :path: ".symlinks/plugins/purchases_flutter/ios" - screen_brightness_ios: - :path: ".symlinks/plugins/screen_brightness_ios/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sign_in_with_apple: :path: ".symlinks/plugins/sign_in_with_apple/ios" sqflite: :path: ".symlinks/plugins/sqflite/darwin" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - volume_controller: - :path: ".symlinks/plugins/volume_controller/ios" wakelock_plus: :path: ".symlinks/plugins/wakelock_plus/ios" SPEC CHECKSUMS: - app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7 - audio_service: 2023a4a1bdb2fd1443e7b00bdbdb1baa321525db - audio_session: 94075f61f538dbe8f90f0cee58af3f1837ba7d2b - file_picker: fb04e739ae6239a76ce1f571863a196a922c87d4 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf - just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854 - media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 - purchases_flutter: da84b1c99daa6c94f77c4e812b5a096ea8eb9916 - PurchasesHybridCommon: f27e7fe57a9934319373b10c260db5d6c10bbb64 - RevenueCat: 4be87c151dff652d2a5b7af46073db11f01ad93f - screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576 - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + purchases_flutter: 818eabac676b9037ac7692d4bc48a52a10b276be + PurchasesHybridCommon: ae7a0a6e105ecdde3e8816a004e57f0a2a7b9261 + RevenueCat: b0ed01125b05a45b8264a2951ad68acb61942038 sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418 sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d - volume_controller: ca1cde542ee70fad77d388f82e9616488110942b wakelock_plus: fd58c82b1388f4afe3fe8aa2c856503a262a5b03 PODFILE CHECKSUM: a35dde46ea09af570b675187a949f5fa3bc82280 diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index 93050bd..557e716 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -57,6 +58,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 11A5CB70E48EE53811F041B1 /* Pods_Runner.framework in Frameworks */, 55F35B592ABF74D1007331B3 /* StoreKit.framework in Frameworks */, ); @@ -134,6 +136,9 @@ /* Begin PBXNativeTarget section */ 97C146ED1CF9000F007C117D /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -159,6 +164,9 @@ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastUpgradeCheck = 1510; @@ -561,6 +569,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..b1bc759 --- /dev/null +++ b/app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,60 @@ +{ + "originHash" : "34b4b4fd64d12b3f877c43c5c1afbd609747cf0fa590d3e8fb35fc7cd91a1fa3", + "pins" : [ + { + "identity" : "dkcamera", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKCamera", + "state" : { + "branch" : "master", + "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96" + } + }, + { + "identity" : "dkimagepickercontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKImagePickerController", + "state" : { + "branch" : "4.3.9", + "revision" : "0bdfeacefa308545adde07bef86e349186335915" + } + }, + { + "identity" : "dkphotogallery", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKPhotoGallery", + "state" : { + "branch" : "master", + "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d" + } + }, + { + "identity" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage", + "state" : { + "revision" : "b62cb63bf4ed1f04c961a56c9c6c9d5ab8524ec6", + "version" : "5.21.1" + } + }, + { + "identity" : "swiftygif", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kirualex/SwiftyGif.git", + "state" : { + "revision" : "4430cbc148baa3907651d40562d96325426f409a", + "version" : "5.4.5" + } + }, + { + "identity" : "tocropviewcontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TimOliver/TOCropViewController", + "state" : { + "revision" : "a634cb7cdfd580006e79a6e74e64417fe9e9783b", + "version" : "2.7.4" + } + } + ], + "version" : 3 +} diff --git a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c53e2b3..5db441f 100644 --- a/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + get dragDevices => { - PointerDeviceKind.touch, - PointerDeviceKind.mouse, - PointerDeviceKind.trackpad, - PointerDeviceKind.stylus, - PointerDeviceKind.unknown, - }; + PointerDeviceKind.touch, + PointerDeviceKind.mouse, + PointerDeviceKind.trackpad, + PointerDeviceKind.stylus, + PointerDeviceKind.unknown, + }; } /// [onGenerateRoute] is used in `onGenerateRoute` and `onGenerateInitialRoutes` @@ -119,15 +119,11 @@ Route onGenerateRoute(RouteSettings settings) { ), ); case '/reset-password': - return MaterialPageRoute( - builder: (_) => const ResetPassword(), - ); + return MaterialPageRoute(builder: (_) => const ResetPassword()); } } - return MaterialPageRoute( - builder: (_) => const Home(), - ); + return MaterialPageRoute(builder: (_) => const Home()); } /// The [FeedDeckApp] is the root widget of the app. The widget is used to @@ -171,23 +167,17 @@ class FeedDeckApp extends StatelessWidget { ), snackBarTheme: const SnackBarThemeData( backgroundColor: Constants.secondary, - contentTextStyle: TextStyle( - color: Constants.onSurface, - ), + contentTextStyle: TextStyle(color: Constants.onSurface), ), - dialogTheme: const DialogTheme( + dialogTheme: const DialogThemeData( backgroundColor: Constants.surface, surfaceTintColor: Constants.surface, - contentTextStyle: TextStyle( - color: Constants.onSurface, - ), + contentTextStyle: TextStyle(color: Constants.onSurface), ), popupMenuTheme: const PopupMenuThemeData( color: Constants.surface, surfaceTintColor: Constants.surface, - textStyle: TextStyle( - color: Constants.onSurface, - ), + textStyle: TextStyle(color: Constants.onSurface), ), drawerTheme: const DrawerThemeData( backgroundColor: Constants.surface, @@ -208,8 +198,9 @@ class FeedDeckApp extends StatelessWidget { ), ), scrollBehavior: FeedDeckScrollBehavior(), - onGenerateInitialRoutes: (initialRoute) => - [onGenerateRoute(RouteSettings(name: initialRoute))], + onGenerateInitialRoutes: (initialRoute) => [ + onGenerateRoute(RouteSettings(name: initialRoute)), + ], onGenerateRoute: (RouteSettings settings) => onGenerateRoute(settings), ), diff --git a/app/lib/widgets/item/details/utils/item_piped/item_piped_video_web.dart b/app/lib/widgets/item/details/utils/item_piped/item_piped_video_web.dart index 04997b1..00e1b55 100644 --- a/app/lib/widgets/item/details/utils/item_piped/item_piped_video_web.dart +++ b/app/lib/widgets/item/details/utils/item_piped/item_piped_video_web.dart @@ -1,4 +1,4 @@ -import 'dart:ui' as ui; +import 'dart:ui_web' as ui; import 'package:flutter/material.dart'; @@ -52,7 +52,6 @@ class _ItemPipedVideoWebState extends State { _iframeElement.style.border = 'none'; _iframeElement.allowFullscreen = true; - // ignore: undefined_prefixed_name ui.platformViewRegistry.registerViewFactory( widget.videoUrl, (int viewId) => _iframeElement, diff --git a/app/lib/widgets/item/details/utils/item_youtube/item_youtube_video_web.dart b/app/lib/widgets/item/details/utils/item_youtube/item_youtube_video_web.dart index 67272c6..dd6364f 100644 --- a/app/lib/widgets/item/details/utils/item_youtube/item_youtube_video_web.dart +++ b/app/lib/widgets/item/details/utils/item_youtube/item_youtube_video_web.dart @@ -1,4 +1,4 @@ -import 'dart:ui' as ui; +import 'dart:ui_web' as ui; import 'package:flutter/material.dart'; @@ -53,7 +53,6 @@ class _ItemYoutubeVideoWebState extends State { _iframeElement.style.border = 'none'; _iframeElement.allowFullscreen = true; - // ignore: undefined_prefixed_name ui.platformViewRegistry.registerViewFactory( widget.videoUrl, (int viewId) => _iframeElement, diff --git a/app/lib/widgets/settings/premium/settings_premium_inapp.dart b/app/lib/widgets/settings/premium/settings_premium_inapp.dart index a55b6c5..d834b89 100644 --- a/app/lib/widgets/settings/premium/settings_premium_inapp.dart +++ b/app/lib/widgets/settings/premium/settings_premium_inapp.dart @@ -33,15 +33,13 @@ class _SettingsPremiumInAppState extends State { Future _fetchOfferings() async { if (Platform.isAndroid) { await Purchases.configure( - PurchasesConfiguration( - SettingsRepository().revenueCatGooglePlayKey, - )..appUserID = supabase.Supabase.instance.client.auth.currentUser!.id, + PurchasesConfiguration(SettingsRepository().revenueCatGooglePlayKey) + ..appUserID = supabase.Supabase.instance.client.auth.currentUser!.id, ); } else if (Platform.isMacOS || Platform.isIOS) { await Purchases.configure( - PurchasesConfiguration( - SettingsRepository().revenueCatAppStoreKey, - )..appUserID = supabase.Supabase.instance.client.auth.currentUser!.id, + PurchasesConfiguration(SettingsRepository().revenueCatAppStoreKey) + ..appUserID = supabase.Supabase.instance.client.auth.currentUser!.id, ); } @@ -62,16 +60,22 @@ class _SettingsPremiumInAppState extends State { _isLoading = true; }); - CustomerInfo customerInfo = await Purchases.purchasePackage(package); + final purchaseResult = await Purchases.purchasePackage(package); setState(() { _isLoading = false; }); - if (!customerInfo.entitlements.all.containsKey('FeedDeck Premium')) { + if (!purchaseResult.customerInfo.entitlements.all.containsKey( + 'FeedDeck Premium', + )) { throw Exception('FeedDeck Premium entitlement not found.'); } - if (customerInfo.entitlements.all['FeedDeck Premium']!.isActive) { + if (purchaseResult + .customerInfo + .entitlements + .all['FeedDeck Premium']! + .isActive) { if (!mounted) return; Provider.of( context, @@ -149,17 +153,12 @@ class _SettingsPremiumInAppState extends State { appBar: AppBar( automaticallyImplyLeading: false, shape: const Border( - bottom: BorderSide( - color: Constants.dividerColor, - width: 1, - ), + bottom: BorderSide(color: Constants.dividerColor, width: 1), ), title: const Text('FeedDeck Premium'), actions: [ IconButton( - icon: const Icon( - Icons.close, - ), + icon: const Icon(Icons.close), onPressed: () { Navigator.of(context).pop(); }, @@ -169,17 +168,15 @@ class _SettingsPremiumInAppState extends State { body: SafeArea( child: FutureBuilder( future: _futureFetchOfferings, - builder: ( - BuildContext context, - AsyncSnapshot snapshot, - ) { + builder: (BuildContext context, AsyncSnapshot snapshot) { return Column( children: [ Expanded( child: Padding( padding: const EdgeInsets.all(Constants.spacingMiddle), child: SingleChildScrollView( - child: snapshot.connectionState == ConnectionState.none || + child: + snapshot.connectionState == ConnectionState.none || snapshot.connectionState == ConnectionState.waiting || snapshot.hasError || @@ -188,7 +185,8 @@ class _SettingsPremiumInAppState extends State { ? const Text('Loading ...') : MarkdownBody( selectable: true, - data: ''' + data: + ''' You are currently using the free version of FeedDeck, which allows you to add up to 10 sources for the first 7 days. After that trial period your sources will not be updated anymore. @@ -202,9 +200,7 @@ canceled at any time. ), ), ), - const SizedBox( - height: Constants.spacingSmall, - ), + const SizedBox(height: Constants.spacingSmall), const Divider( color: Constants.dividerColor, height: 1, @@ -230,15 +226,16 @@ canceled at any time. ), onPressed: snapshot.connectionState == ConnectionState.none || - snapshot.connectionState == - ConnectionState.waiting || - snapshot.hasError || - snapshot.data == null || - snapshot.data?.monthly == null || - _isLoading - ? null - : () => _purchase(snapshot.data!.monthly!), - icon: snapshot.connectionState == ConnectionState.none || + snapshot.connectionState == + ConnectionState.waiting || + snapshot.hasError || + snapshot.data == null || + snapshot.data?.monthly == null || + _isLoading + ? null + : () => _purchase(snapshot.data!.monthly!), + icon: + snapshot.connectionState == ConnectionState.none || snapshot.connectionState == ConnectionState.waiting || snapshot.hasError || diff --git a/app/linux/flutter/generated_plugin_registrant.cc b/app/linux/flutter/generated_plugin_registrant.cc index d685b63..4752796 100644 --- a/app/linux/flutter/generated_plugin_registrant.cc +++ b/app/linux/flutter/generated_plugin_registrant.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -29,6 +30,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); + g_autoptr(FlPluginRegistrar) volume_controller_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "VolumeControllerPlugin"); + volume_controller_plugin_register_with_registrar(volume_controller_registrar); g_autoptr(FlPluginRegistrar) window_manager_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); window_manager_plugin_register_with_registrar(window_manager_registrar); diff --git a/app/linux/flutter/generated_plugins.cmake b/app/linux/flutter/generated_plugins.cmake index c747984..cfa7fa0 100644 --- a/app/linux/flutter/generated_plugins.cmake +++ b/app/linux/flutter/generated_plugins.cmake @@ -8,11 +8,11 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_video screen_retriever_linux url_launcher_linux + volume_controller window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - media_kit_native_event_loop ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift index 24c1c51..9057e3c 100644 --- a/app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,12 +15,12 @@ import media_kit_video import package_info_plus import path_provider_foundation import purchases_flutter -import screen_brightness_macos import screen_retriever_macos import shared_preferences_foundation import sign_in_with_apple import sqflite import url_launcher_macos +import volume_controller import wakelock_plus import window_manager @@ -35,12 +35,12 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) PurchasesFlutterPlugin.register(with: registry.registrar(forPlugin: "PurchasesFlutterPlugin")) - ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin")) ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) + VolumeControllerPlugin.register(with: registry.registrar(forPlugin: "VolumeControllerPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/app/macos/Podfile.lock b/app/macos/Podfile.lock index 061aa29..ad72e51 100644 --- a/app/macos/Podfile.lock +++ b/app/macos/Podfile.lock @@ -1,73 +1,34 @@ PODS: - - app_links (1.0.0): - - FlutterMacOS - - audio_service (0.14.1): - - FlutterMacOS - - audio_session (0.0.1): - - FlutterMacOS - - file_picker (0.0.1): - - FlutterMacOS - FlutterMacOS (1.0.0) - - just_audio (0.0.1): - - Flutter - - FlutterMacOS - media_kit_libs_macos_video (1.0.4): - FlutterMacOS - - media_kit_native_event_loop (1.0.0): - - FlutterMacOS - media_kit_video (0.0.1): - FlutterMacOS - - package_info_plus (0.0.1): - - FlutterMacOS - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - - purchases_flutter (8.6.1): - - FlutterMacOS - - PurchasesHybridCommon (= 13.25.0) - - PurchasesHybridCommon (13.25.0): - - RevenueCat (= 5.19.0) - - RevenueCat (5.19.0) - - screen_brightness_macos (0.1.0): + - purchases_flutter (9.1.0): - FlutterMacOS + - PurchasesHybridCommon (= 16.0.2) + - PurchasesHybridCommon (16.0.2): + - RevenueCat (= 5.33.1) + - RevenueCat (5.33.1) - screen_retriever_macos (0.0.1): - FlutterMacOS - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - sign_in_with_apple (0.0.1): - FlutterMacOS - sqflite (0.0.3): - Flutter - FlutterMacOS - - url_launcher_macos (0.0.1): - - FlutterMacOS - wakelock_plus (0.0.1): - FlutterMacOS - - window_manager (0.2.0): - - FlutterMacOS DEPENDENCIES: - - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`) - - audio_service (from `Flutter/ephemeral/.symlinks/plugins/audio_service/macos`) - - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) - - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/darwin`) - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`) - - media_kit_native_event_loop (from `Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos`) - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`) - - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - purchases_flutter (from `Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos`) - - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`) - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`) - - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - sign_in_with_apple (from `Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`) - - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) - - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`) SPEC REPOS: trunk: @@ -75,70 +36,34 @@ SPEC REPOS: - RevenueCat EXTERNAL SOURCES: - app_links: - :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos - audio_service: - :path: Flutter/ephemeral/.symlinks/plugins/audio_service/macos - audio_session: - :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos - file_picker: - :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos FlutterMacOS: :path: Flutter/ephemeral - just_audio: - :path: Flutter/ephemeral/.symlinks/plugins/just_audio/darwin media_kit_libs_macos_video: :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos - media_kit_native_event_loop: - :path: Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos media_kit_video: :path: Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos - package_info_plus: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos - path_provider_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin purchases_flutter: :path: Flutter/ephemeral/.symlinks/plugins/purchases_flutter/macos - screen_brightness_macos: - :path: Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos screen_retriever_macos: :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos - shared_preferences_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin sign_in_with_apple: :path: Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/darwin - url_launcher_macos: - :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos wakelock_plus: :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos - window_manager: - :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos SPEC CHECKSUMS: - app_links: afe860c55c7ef176cea7fb630a2b7d7736de591d - audio_service: 0d9e4e25347bb3efb768f3b9f005911a81e587a7 - audio_session: 48ab6500f7a5e7c64363e206565a5dfe5a0c1441 - file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed media_kit_libs_macos_video: 85a23e549b5f480e72cae3e5634b5514bc692f65 - media_kit_native_event_loop: a80d071c835c612fd80173e79390a50ec409f1b1 media_kit_video: fa6564e3799a0a28bff39442334817088b7ca758 - package_info_plus: f0052d280d17aa382b932f399edf32507174e870 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 - purchases_flutter: efd7616f31d22f4170bed28994535b6b9145761c - PurchasesHybridCommon: f27e7fe57a9934319373b10c260db5d6c10bbb64 - RevenueCat: 4be87c151dff652d2a5b7af46073db11f01ad93f - screen_brightness_macos: 2a3ee243f8051c340381e8e51bcedced8360f421 + purchases_flutter: 7655c5b1ec1236b102c30f02d3d0c7d87117bd2d + PurchasesHybridCommon: ae7a0a6e105ecdde3e8816a004e57f0a2a7b9261 + RevenueCat: b0ed01125b05a45b8264a2951ad68acb61942038 screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 sign_in_with_apple: 6673c03c9e3643f6c8d33601943fbfa9ae99f94e sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3 - url_launcher_macos: de10e46d8d8b9e3a7b8a133e8de92b104379f05e wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497 - window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c PODFILE CHECKSUM: 8d40c19d3cbdb380d870685c3a564c989f1efa52 diff --git a/app/macos/Runner.xcodeproj/project.pbxproj b/app/macos/Runner.xcodeproj/project.pbxproj index 0ab96d2..5742c85 100644 --- a/app/macos/Runner.xcodeproj/project.pbxproj +++ b/app/macos/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 553BE2622AC0648A002EA0C0 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 553BE2612AC0648A002EA0C0 /* StoreKit.framework */; }; FBF50439F2C4D0BF615EFED2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D60858A3CD81E41E2CDBF2 /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -83,6 +84,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, FBF50439F2C4D0BF615EFED2 /* Pods_Runner.framework in Frameworks */, 553BE2622AC0648A002EA0C0 /* StoreKit.framework in Frameworks */, ); @@ -180,6 +182,9 @@ /* Begin PBXNativeTarget section */ 33CC10EC2044A3C60003C045 /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -205,6 +210,9 @@ /* Begin PBXProject section */ 33CC10E52044A3C60003C045 /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; @@ -645,6 +653,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c59c941..b718a6a 100644 --- a/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + =3.7.0 <4.0.0" + dart: ">=3.8.1 <4.0.0" flutter: ">=3.27.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index c6496e2..89bbdb0 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.4.1+12 environment: - sdk: ^3.5.0 + sdk: ^3.8.1 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -39,38 +39,38 @@ dependencies: app_links: ^6.4.0 cached_network_image: ^3.4.1 - carousel_slider: ^5.0.0 + carousel_slider: ^5.1.1 collection: ^1.17.0 crypto: ^3.0.6 - file_picker: ^10.1.2 + file_picker: ^10.2.0 flutter_cache_manager: ^3.4.0 - flutter_markdown: ^0.7.6 - flutter_native_splash: ^2.4.5 - html: ^0.15.5 + flutter_markdown: ^0.7.7+1 + flutter_native_splash: ^2.4.6 + html: ^0.15.6 html2md: ^1.3.2 - http: ^1.3.0 - intl: ^0.19.0 - just_audio: ^0.9.46 - just_audio_background: ^0.0.1-beta.15 - just_audio_media_kit: ^2.0.6 + http: ^1.4.0 + intl: ^0.20.2 + just_audio: ^0.10.4 + just_audio_background: ^0.0.1-beta.17 + just_audio_media_kit: ^2.1.0 media_kit: ^1.1.10+1 - media_kit_video: ^1.2.5 - media_kit_libs_video: ^1.0.5 + media_kit_video: ^1.3.0 + media_kit_libs_video: ^1.0.6 package_info_plus: ^8.3.0 piped_client: ^0.1.2 - provider: ^6.1.2 - purchases_flutter: ^8.6.1 + provider: ^6.1.5 + purchases_flutter: ^9.1.0 rxdart: ^0.28.0 scroll_to_index: ^3.0.1 - shared_preferences: ^2.5.2 - sign_in_with_apple: ^6.1.4 - supabase_flutter: ^2.8.4 + shared_preferences: ^2.5.3 + sign_in_with_apple: ^7.0.1 + supabase_flutter: ^2.9.1 timeago: ^3.7.0 - url_launcher: ^6.3.1 + url_launcher: ^6.3.2 web: ^1.1.1 - window_manager: ^0.4.3 + window_manager: ^0.5.1 xml: ^6.5.0 - youtube_explode_dart: ^2.3.10 + youtube_explode_dart: ^2.5.1 dev_dependencies: flutter_test: @@ -81,11 +81,11 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0 - flutter_launcher_icons: ^0.14.3 + flutter_launcher_icons: ^0.14.4 import_sorter: ^4.6.0 - msix: ^3.16.8 + msix: ^3.16.9 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/app/windows/flutter/generated_plugin_registrant.cc b/app/windows/flutter/generated_plugin_registrant.cc index e33d087..6336df0 100644 --- a/app/windows/flutter/generated_plugin_registrant.cc +++ b/app/windows/flutter/generated_plugin_registrant.cc @@ -9,9 +9,9 @@ #include #include #include -#include #include #include +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -21,12 +21,12 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi")); MediaKitVideoPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi")); - ScreenBrightnessWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin")); ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); + VolumeControllerPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("VolumeControllerPluginCApi")); WindowManagerPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/app/windows/flutter/generated_plugins.cmake b/app/windows/flutter/generated_plugins.cmake index 85b6c64..94b48ac 100644 --- a/app/windows/flutter/generated_plugins.cmake +++ b/app/windows/flutter/generated_plugins.cmake @@ -6,14 +6,13 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links media_kit_libs_windows_video media_kit_video - screen_brightness_windows screen_retriever_windows url_launcher_windows + volume_controller window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - media_kit_native_event_loop ) set(PLUGIN_BUNDLED_LIBRARIES)