diff --git a/.fvmrc b/.fvmrc index 284aa615..4b5f4d56 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,4 +1,4 @@ { - "flutter": "3.41.2", + "flutter": "3.44.0", "flavors": {} } \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd4cdf1d..d3496a1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: "stable" # Or 'beta' or 'master' depending on your needs - flutter-version: 3.41.2 # should sync with fvm version + flutter-version: 3.44.0 # should sync with fvm version cache: true # this relies on the new flutter 3.6.0 workspace feature diff --git a/.vscode/settings.json b/.vscode/settings.json index 672d1c1f..519ebe39 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,5 +24,5 @@ "viện", "xuất" ], - "dart.flutterSdkPath": ".fvm/versions/3.41.2" + "dart.flutterSdkPath": ".fvm/versions/3.44.0" } \ No newline at end of file diff --git a/adaptive_explorer/CHANGELOG.md b/adaptive_explorer/CHANGELOG.md index 398ae281..c656968a 100644 --- a/adaptive_explorer/CHANGELOG.md +++ b/adaptive_explorer/CHANGELOG.md @@ -2,7 +2,8 @@ ## [0.8.0] -- no changes yet +- Updated to Dart SDK 3.12 and Flutter 3.44 +- Migrated to Swift Package Manager from CocoaPods ## [0.7.0] diff --git a/adaptive_explorer/macos/Flutter/Flutter-Debug.xcconfig b/adaptive_explorer/macos/Flutter/Flutter-Debug.xcconfig index 4b81f9b2..c2efd0b6 100644 --- a/adaptive_explorer/macos/Flutter/Flutter-Debug.xcconfig +++ b/adaptive_explorer/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/adaptive_explorer/macos/Flutter/Flutter-Release.xcconfig b/adaptive_explorer/macos/Flutter/Flutter-Release.xcconfig index 5caa9d15..c2efd0b6 100644 --- a/adaptive_explorer/macos/Flutter/Flutter-Release.xcconfig +++ b/adaptive_explorer/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/adaptive_explorer/macos/Podfile b/adaptive_explorer/macos/Podfile deleted file mode 100644 index ff5ddb3b..00000000 --- a/adaptive_explorer/macos/Podfile +++ /dev/null @@ -1,42 +0,0 @@ -platform :osx, '10.15' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def flutter_root - generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) - unless File.exist?(generated_xcode_build_settings_path) - raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" - end - - File.foreach(generated_xcode_build_settings_path) do |line| - matches = line.match(/FLUTTER_ROOT\=(.*)/) - return matches[1].strip if matches - end - raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" -end - -require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) - -flutter_macos_podfile_setup - -target 'Runner' do - use_frameworks! - - flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) - target 'RunnerTests' do - inherit! :search_paths - end -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_macos_build_settings(target) - end -end diff --git a/adaptive_explorer/macos/Podfile.lock b/adaptive_explorer/macos/Podfile.lock deleted file mode 100644 index 90c5e275..00000000 --- a/adaptive_explorer/macos/Podfile.lock +++ /dev/null @@ -1,47 +0,0 @@ -PODS: - - file_picker (0.0.1): - - FlutterMacOS - - FlutterMacOS (1.0.0) - - package_info_plus (0.0.1): - - FlutterMacOS - - url_launcher_macos (0.0.1): - - FlutterMacOS - - video_player_avfoundation (0.0.1): - - Flutter - - FlutterMacOS - - wakelock_plus (0.0.1): - - FlutterMacOS - -DEPENDENCIES: - - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`) - - FlutterMacOS (from `Flutter/ephemeral`) - - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) - - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) - -EXTERNAL SOURCES: - file_picker: - :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos - FlutterMacOS: - :path: Flutter/ephemeral - package_info_plus: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos - url_launcher_macos: - :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos - video_player_avfoundation: - :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin - wakelock_plus: - :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos - -SPEC CHECKSUMS: - file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a - FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 - package_info_plus: f0052d280d17aa382b932f399edf32507174e870 - url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd - video_player_avfoundation: 3453f792138786248960ca029747fcd9f318ef52 - wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b - -PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009 - -COCOAPODS: 1.16.2 diff --git a/adaptive_explorer/macos/Runner.xcodeproj/project.pbxproj b/adaptive_explorer/macos/Runner.xcodeproj/project.pbxproj index 8c6b90d1..13c98856 100644 --- a/adaptive_explorer/macos/Runner.xcodeproj/project.pbxproj +++ b/adaptive_explorer/macos/Runner.xcodeproj/project.pbxproj @@ -27,8 +27,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 56BE297ADB806A83B99574DB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F75A7EFDA53F5BB005875BC3 /* Pods_Runner.framework */; }; - BD51456EB5D5A688B2975BE4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA7CEEFCBD555ED4EDA1422 /* Pods_RunnerTests.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,10 +61,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0FAA326E550E8335FCD5B01A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 14F283D2003845ABF8D41194 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 1DA7CEEFCBD555ED4EDA1422 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2EF520C673CC51E4660C639B /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -82,12 +77,9 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 6A08AA9DEDF2DA208A7EBAE2 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - CEB82790A3565A3447C26701 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - D2A74A7F07257FEFD929AC10 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - F75A7EFDA53F5BB005875BC3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +87,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BD51456EB5D5A688B2975BE4 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,27 +94,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 56BE297ADB806A83B99574DB /* Pods_Runner.framework in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1AF68A9A6F1B240006D9871E /* Pods */ = { - isa = PBXGroup; - children = ( - 0FAA326E550E8335FCD5B01A /* Pods-Runner.debug.xcconfig */, - 14F283D2003845ABF8D41194 /* Pods-Runner.release.xcconfig */, - D2A74A7F07257FEFD929AC10 /* Pods-Runner.profile.xcconfig */, - CEB82790A3565A3447C26701 /* Pods-RunnerTests.debug.xcconfig */, - 2EF520C673CC51E4660C639B /* Pods-RunnerTests.release.xcconfig */, - 6A08AA9DEDF2DA208A7EBAE2 /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 331C80D6294CF71000263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( @@ -150,8 +127,6 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, - D73912EC22F37F3D000D13A0 /* Frameworks */, - 1AF68A9A6F1B240006D9871E /* Pods */, ); sourceTree = ""; }; @@ -178,6 +153,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, @@ -199,15 +175,6 @@ path = Runner; sourceTree = ""; }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - F75A7EFDA53F5BB005875BC3 /* Pods_Runner.framework */, - 1DA7CEEFCBD555ED4EDA1422 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -215,7 +182,6 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - A6FF64C198201247A0EB0615 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +200,11 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - A786B87F0B69B6A51D150BE4 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 090FF471B91450A7398AF231 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -248,6 +212,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* adaptive_explorer.app */; productType = "com.apple.product-type.application"; @@ -292,6 +259,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -323,23 +293,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 090FF471B91450A7398AF231 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -378,50 +331,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - A6FF64C198201247A0EB0615 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - A786B87F0B69B6A51D150BE4 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -473,7 +382,6 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CEB82790A3565A3447C26701 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +396,6 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2EF520C673CC51E4660C639B /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +410,6 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6A08AA9DEDF2DA208A7EBAE2 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -796,6 +702,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "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/adaptive_explorer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/adaptive_explorer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 2a84b339..48584851 100644 --- a/adaptive_explorer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/adaptive_explorer/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + flutter --version -Flutter 3.41.2 • channel stable • https://github.com/flutter/flutter.git -Framework • revision 90673a4eef (2 months ago) • 2026-02-18 13:54:59 -0800 -Engine • hash d96704abcce17ff165bbef9d77123407ef961017 (revision 6c0baaebf7) (2 months ago) • 2026-02-18 19:22:23.000Z -Tools • Dart 3.11.0 • DevTools 2.54.1 +Flutter 3.44.0 • channel stable • https://github.com/flutter/flutter.git +Framework • revision 559ffa3f75 (10 days ago) • 2026-05-15 14:13:13 -0700 +Engine • hash fcf463a2242790d1fdcd9d044f533080f5022e18 (revision 4c525dac5e) (10 days ago) • 2026-05-15 19:00:04.000Z +Tools • Dart 3.12.0 • DevTools 2.57.0 ``` You can move to this version of flutter by installing fvm and then: ```zsh -fvm install 3.41.2 -#fvm use 3.41.2 +fvm install 3.44.0 +#fvm use 3.44.0 ``` Released Flutter / Dart bundling versions are located here: diff --git a/packages/flutter_adaptive_cards_fs/pubspec.yaml b/packages/flutter_adaptive_cards_fs/pubspec.yaml index 906bb1d0..bd889cc8 100644 --- a/packages/flutter_adaptive_cards_fs/pubspec.yaml +++ b/packages/flutter_adaptive_cards_fs/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/freemansoft/Flutter-AdaptiveCards repository: https://github.com/freemansoft/Flutter-AdaptiveCards environment: - sdk: ^3.11.0 + sdk: ^3.12.0 resolution: workspace dependencies: diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1-base.png index 4ac76e63..e476c1c4 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample14-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample14-base.png index a645b203..09b46551 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample14-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample14-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_comment.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_comment.png index f604e97d..cf2434cf 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_comment.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_comment.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_set_due_date.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_set_due_date.png index 69451a2a..4aefe450 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_set_due_date.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample1_set_due_date.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample3-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample3-base.png index 2346c44d..d4efc611 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample3-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample3-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample4-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample4-base.png index 2384345f..85f69a10 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample4-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample4-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-base.png index 5e2d12e2..9cba9fb5 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-chicken.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-chicken.png index 3f44d1ac..31f5077f 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-chicken.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-chicken.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-steak.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-steak.png index c283ff09..9ec69b70 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-steak.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-steak.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-tofu.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-tofu.png index d8b0b104..ab3f2a89 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-tofu.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/sample5-tofu.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table1-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table1-base.png index 4021ea26..b13a0525 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table1-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table1-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table2-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table2-base.png index 10e7c421..46bf3625 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table2-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/table2-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_accordion.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_accordion.png index c4d1636f..e129edfb 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_accordion.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_accordion.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_badge.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_badge.png index 7abcea49..de8bf56e 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_badge.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_badge.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_carousel.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_carousel.png index 26e0b4db..6b18e38a 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_carousel.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_carousel.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_base.png index 1336448f..58476690 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_dialog.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_dialog.png index 7cc6a70b..6d71cb2c 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_dialog.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_popover_dialog.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_rating.png b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_rating.png index 297deef3..b1fba0d5 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_rating.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/linux/v1_6_rating.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1-base.png index b84cbbc1..228f244d 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample14-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample14-base.png index fd4adce6..a7c9f1cf 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample14-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample14-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_comment.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_comment.png index 6a52ba14..a3a29858 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_comment.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_comment.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_set_due_date.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_set_due_date.png index 199a3b5d..a30ec431 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_set_due_date.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample1_set_due_date.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2-base.png index d261b7c1..25a15d49 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_ill_be_late.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_ill_be_late.png index d261b7c1..25a15d49 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_ill_be_late.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_ill_be_late.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_snooze.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_snooze.png index d261b7c1..25a15d49 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_snooze.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample2_snooze.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample3-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample3-base.png index 1217aa57..10fc859e 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample3-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample3-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample4-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample4-base.png index 4f9927b7..e7819dad 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample4-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample4-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-base.png index e71dac76..0092955e 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-chicken.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-chicken.png index 3d04e1a3..6d600574 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-chicken.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-chicken.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-steak.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-steak.png index ddd99977..2c4df000 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-steak.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-steak.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-tofu.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-tofu.png index 70479543..84b048a5 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-tofu.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/sample5-tofu.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table1-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table1-base.png index 34ab3356..94f0b8fa 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table1-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table1-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table2-base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table2-base.png index 9ef28120..2cc94020 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table2-base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/table2-base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_accordion.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_accordion.png index a368736f..2cdca954 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_accordion.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_accordion.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_badge.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_badge.png index 7e8a7233..9c4f687a 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_badge.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_badge.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_carousel.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_carousel.png index d4ef2861..081ea9f5 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_carousel.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_carousel.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_code_block.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_code_block.png index 3da211a7..a06a9a26 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_code_block.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_code_block.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_base.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_base.png index bc1b4673..494d6adc 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_base.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_base.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_dialog.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_dialog.png index bfcb2b3b..471fe559 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_dialog.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_popover_dialog.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_progress_bar.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_progress_bar.png index ac159fd3..f86ff867 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_progress_bar.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_progress_bar.png differ diff --git a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_rating.png b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_rating.png index 096892ec..ed7d9595 100644 Binary files a/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_rating.png and b/packages/flutter_adaptive_cards_fs/test/gold_files/macos/v1_6_rating.png differ diff --git a/packages/flutter_adaptive_charts_fs/CHANGELOG.md b/packages/flutter_adaptive_charts_fs/CHANGELOG.md index fe59e99b..1978b74f 100644 --- a/packages/flutter_adaptive_charts_fs/CHANGELOG.md +++ b/packages/flutter_adaptive_charts_fs/CHANGELOG.md @@ -2,7 +2,7 @@ ## [0.8.0] -- no changes yet +- Updated to Dart SDK 3.12 and Flutter 3.44 ## [0.7.0] diff --git a/packages/flutter_adaptive_charts_fs/pubspec.yaml b/packages/flutter_adaptive_charts_fs/pubspec.yaml index b62d1aa9..4b91de1b 100644 --- a/packages/flutter_adaptive_charts_fs/pubspec.yaml +++ b/packages/flutter_adaptive_charts_fs/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/freemansoft/Flutter-AdaptiveCards repository: https://github.com/freemansoft/Flutter-AdaptiveCards environment: - sdk: ^3.11.0 + sdk: ^3.12.0 resolution: workspace dependencies: diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_horizontal_bar.png b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_horizontal_bar.png index 0582e365..0a19e74d 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_horizontal_bar.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_horizontal_bar.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_line.png b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_line.png index eefafcaa..555484d9 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_line.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_line.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_pie.png b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_pie.png index 90c85397..6b0870e1 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_pie.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_pie.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_vertical_bar.png b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_vertical_bar.png index 9a95369d..ffafb369 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_vertical_bar.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/linux/v1_6_vertical_bar.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_donut.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_donut.png index 1627a2db..19856557 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_donut.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_donut.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar.png index f3fbb94b..af153084 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar_stacked.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar_stacked.png index 8fe0ab27..69e4b0b9 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar_stacked.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_horizontal_bar_stacked.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_line.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_line.png index a1e17277..497666a6 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_line.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_line.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_pie.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_pie.png index edf417c1..3cb4056f 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_pie.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_pie.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar.png index 4015dfd4..fb247de5 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar.png differ diff --git a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar_grouped.png b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar_grouped.png index 668aa21a..e3e4fbaf 100644 Binary files a/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar_grouped.png and b/packages/flutter_adaptive_charts_fs/test/gold_files/macos/v1_6_vertical_bar_grouped.png differ diff --git a/packages/flutter_adaptive_template_fs/CHANGELOG.md b/packages/flutter_adaptive_template_fs/CHANGELOG.md index d71a9113..2cab8c8f 100644 --- a/packages/flutter_adaptive_template_fs/CHANGELOG.md +++ b/packages/flutter_adaptive_template_fs/CHANGELOG.md @@ -2,7 +2,7 @@ ## [0.8.0] -- no changes yet +- Updated to Dart SDK 3.12 and Flutter 3.44 ## [0.7.0] diff --git a/packages/flutter_adaptive_template_fs/pubspec.yaml b/packages/flutter_adaptive_template_fs/pubspec.yaml index 7268c053..00f813f8 100644 --- a/packages/flutter_adaptive_template_fs/pubspec.yaml +++ b/packages/flutter_adaptive_template_fs/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/freemansoft/Flutter-AdaptiveCards repository: https://github.com/freemansoft/Flutter-AdaptiveCards environment: - sdk: ^3.11.0 + sdk: ^3.12.0 resolution: workspace dependencies: diff --git a/pubspec.lock b/pubspec.lock index 8dce2059..715c9852 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d" + sha256: a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c url: "https://pub.dev" source: hosted - version: "93.0.0" + version: "99.0.0" accessibility_tools: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b + sha256: "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7" url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "12.1.0" args: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2" + sha256: a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98 url: "https://pub.dev" source: hosted - version: "3.1.7" + version: "3.1.8" dbus: dependency: transitive description: @@ -425,10 +425,10 @@ packages: dependency: transitive description: name: json_annotation - sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8 + sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80" url: "https://pub.dev" source: hosted - version: "4.11.0" + version: "4.12.0" json_editor_flutter: dependency: transitive description: @@ -481,10 +481,10 @@ packages: dependency: transitive description: name: matcher - sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.18" + version: "0.12.19" material_color_utilities: dependency: transitive description: @@ -497,10 +497,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" mime: dependency: transitive description: @@ -758,26 +758,26 @@ packages: dependency: transitive description: name: test - sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a" + sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20" url: "https://pub.dev" source: hosted - version: "1.29.0" + version: "1.31.0" test_api: dependency: transitive description: name: test_api - sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.9" + version: "0.7.11" test_core: dependency: transitive description: name: test_core - sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943" + sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34" url: "https://pub.dev" source: hosted - version: "0.6.15" + version: "0.6.17" typed_data: dependency: transitive description: @@ -798,10 +798,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572" + sha256: "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c" url: "https://pub.dev" source: hosted - version: "6.3.29" + version: "6.3.30" url_launcher_ios: dependency: transitive description: @@ -862,10 +862,10 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "4d35a36400983c3457c289d4d553b5308f506ea84f7e51c7a564651b5525209a" + sha256: "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" vector_graphics_codec: dependency: transitive description: @@ -878,10 +878,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "98e7e94de127b46a86ef46197fff84ff99f3d3b80a708390d717ad731efef598" + sha256: b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" vector_math: dependency: transitive description: @@ -918,10 +918,10 @@ packages: dependency: transitive description: name: video_player_avfoundation - sha256: a39d6f28f8069564d8cc17396472f958dd9eaddf2d5c8e90aad4d793ac369bf3 + sha256: "9338f3ec22774f88146b22f13273a446719b1da010fd200c4d1d97802156ac58" url: "https://pub.dev" source: hosted - version: "2.9.6" + version: "2.9.7" video_player_platform_interface: dependency: transitive description: @@ -1051,5 +1051,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.11.0 <4.0.0" + dart: ">=3.12.0 <4.0.0" flutter: ">=3.38.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2193079c..5ee69c82 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: _ publish_to: none environment: - sdk: ^3.11.0 + sdk: ^3.12.0 workspace: - packages/flutter_adaptive_cards_fs - packages/flutter_adaptive_charts_fs diff --git a/widgetbook/CHANGELOG.md b/widgetbook/CHANGELOG.md index 2f7fb22f..4475d84b 100644 --- a/widgetbook/CHANGELOG.md +++ b/widgetbook/CHANGELOG.md @@ -2,7 +2,8 @@ ## [0.8.0] -- no changes yet +- Updated to Dart SDK 3.12 and Flutter 3.44 +- Migrated to Swift Package Manager from CocoaPods ## [0.7.0] diff --git a/widgetbook/ios/Flutter/AppFrameworkInfo.plist b/widgetbook/ios/Flutter/AppFrameworkInfo.plist index 1dc6cf76..391a902b 100644 --- a/widgetbook/ios/Flutter/AppFrameworkInfo.plist +++ b/widgetbook/ios/Flutter/AppFrameworkInfo.plist @@ -20,7 +20,5 @@ ???? CFBundleVersion 1.0 - MinimumOSVersion - 13.0 diff --git a/widgetbook/ios/Flutter/Debug.xcconfig b/widgetbook/ios/Flutter/Debug.xcconfig index ec97fc6f..592ceee8 100644 --- a/widgetbook/ios/Flutter/Debug.xcconfig +++ b/widgetbook/ios/Flutter/Debug.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/widgetbook/ios/Flutter/Release.xcconfig b/widgetbook/ios/Flutter/Release.xcconfig index c4855bfe..592ceee8 100644 --- a/widgetbook/ios/Flutter/Release.xcconfig +++ b/widgetbook/ios/Flutter/Release.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/widgetbook/ios/Podfile b/widgetbook/ios/Podfile deleted file mode 100644 index 620e46eb..00000000 --- a/widgetbook/ios/Podfile +++ /dev/null @@ -1,43 +0,0 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '13.0' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def flutter_root - generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) - unless File.exist?(generated_xcode_build_settings_path) - raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" - end - - File.foreach(generated_xcode_build_settings_path) do |line| - matches = line.match(/FLUTTER_ROOT\=(.*)/) - return matches[1].strip if matches - end - raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" -end - -require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) - -flutter_ios_podfile_setup - -target 'Runner' do - use_frameworks! - - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) - target 'RunnerTests' do - inherit! :search_paths - end -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) - end -end diff --git a/widgetbook/ios/Podfile.lock b/widgetbook/ios/Podfile.lock deleted file mode 100644 index 50f8842a..00000000 --- a/widgetbook/ios/Podfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -PODS: - - Flutter (1.0.0) - - package_info_plus (0.4.5): - - Flutter - - url_launcher_ios (0.0.1): - - Flutter - - video_player_avfoundation (0.0.1): - - Flutter - - FlutterMacOS - - wakelock_plus (0.0.1): - - Flutter - -DEPENDENCIES: - - Flutter (from `Flutter`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - -EXTERNAL SOURCES: - Flutter: - :path: Flutter - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - video_player_avfoundation: - :path: ".symlinks/plugins/video_player_avfoundation/darwin" - wakelock_plus: - :path: ".symlinks/plugins/wakelock_plus/ios" - -SPEC CHECKSUMS: - Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b - video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a - wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556 - -PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e - -COCOAPODS: 1.16.2 diff --git a/widgetbook/ios/Runner.xcodeproj/project.pbxproj b/widgetbook/ios/Runner.xcodeproj/project.pbxproj index 5635ea48..26686bc0 100644 --- a/widgetbook/ios/Runner.xcodeproj/project.pbxproj +++ b/widgetbook/ios/Runner.xcodeproj/project.pbxproj @@ -11,11 +11,10 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 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 */; }; - E875183A1EFE8E5F0C487FC6 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C6B4149DF8E3E4AB86C3999 /* Pods_RunnerTests.framework */; }; - E98B3B95B545C98F4DD6FA79 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8357A2ECAF222D39400FB684 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,17 +43,13 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1D0EC64755053FD73E234254 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 2397049FD2FBD1135EADA040 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 31E6CA4A7EDD5E52E211C182 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3C6B4149DF8E3E4AB86C3999 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8357A2ECAF222D39400FB684 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -62,9 +57,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BA2E3A0B220E65F08C0546C5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - D0804164B0DCF8D59BF0070C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - FF4556222A9FB92658C60B43 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,7 +64,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E875183A1EFE8E5F0C487FC6 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,7 +71,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E98B3B95B545C98F4DD6FA79 /* Pods_Runner.framework in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,6 +89,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -113,8 +105,6 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - CD016E01C9D06A1F0E9266AD /* Pods */, - C97E4C277D8BFCD7F91D91EC /* Frameworks */, ); sourceTree = ""; }; @@ -142,29 +132,6 @@ path = Runner; sourceTree = ""; }; - C97E4C277D8BFCD7F91D91EC /* Frameworks */ = { - isa = PBXGroup; - children = ( - 8357A2ECAF222D39400FB684 /* Pods_Runner.framework */, - 3C6B4149DF8E3E4AB86C3999 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - CD016E01C9D06A1F0E9266AD /* Pods */ = { - isa = PBXGroup; - children = ( - 2397049FD2FBD1135EADA040 /* Pods-Runner.debug.xcconfig */, - BA2E3A0B220E65F08C0546C5 /* Pods-Runner.release.xcconfig */, - D0804164B0DCF8D59BF0070C /* Pods-Runner.profile.xcconfig */, - 1D0EC64755053FD73E234254 /* Pods-RunnerTests.debug.xcconfig */, - 31E6CA4A7EDD5E52E211C182 /* Pods-RunnerTests.release.xcconfig */, - FF4556222A9FB92658C60B43 /* Pods-RunnerTests.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -172,7 +139,6 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 1B52B61097E1C35DEBE04F49 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, 95170CE79541A237F34380EB /* Frameworks */, @@ -191,20 +157,21 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - BCFF9B46E8031F1A73DA9B33 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 8578989C9C0B5B9A8D59F0B7 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -238,6 +205,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -270,28 +240,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1B52B61097E1C35DEBE04F49 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -308,23 +256,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8578989C9C0B5B9A8D59F0B7 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -340,28 +271,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - BCFF9B46E8031F1A73DA9B33 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -487,7 +396,6 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1D0EC64755053FD73E234254 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -505,7 +413,6 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 31E6CA4A7EDD5E52E211C182 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -521,7 +428,6 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FF4556222A9FB92658C60B43 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -723,6 +629,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "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/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e3773d42..c3fedb29 100644 --- a/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/widgetbook/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/widgetbook/ios/Runner/Info.plist b/widgetbook/ios/Runner/Info.plist index 146e7bf3..c2b83760 100644 --- a/widgetbook/ios/Runner/Info.plist +++ b/widgetbook/ios/Runner/Info.plist @@ -2,6 +2,8 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -24,6 +26,29 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,9 +66,5 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - diff --git a/widgetbook/macos/Flutter/Flutter-Debug.xcconfig b/widgetbook/macos/Flutter/Flutter-Debug.xcconfig index 4b81f9b2..c2efd0b6 100644 --- a/widgetbook/macos/Flutter/Flutter-Debug.xcconfig +++ b/widgetbook/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/widgetbook/macos/Flutter/Flutter-Release.xcconfig b/widgetbook/macos/Flutter/Flutter-Release.xcconfig index 5caa9d15..c2efd0b6 100644 --- a/widgetbook/macos/Flutter/Flutter-Release.xcconfig +++ b/widgetbook/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1 @@ -#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/widgetbook/macos/Podfile b/widgetbook/macos/Podfile deleted file mode 100644 index ff5ddb3b..00000000 --- a/widgetbook/macos/Podfile +++ /dev/null @@ -1,42 +0,0 @@ -platform :osx, '10.15' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def flutter_root - generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) - unless File.exist?(generated_xcode_build_settings_path) - raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" - end - - File.foreach(generated_xcode_build_settings_path) do |line| - matches = line.match(/FLUTTER_ROOT\=(.*)/) - return matches[1].strip if matches - end - raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" -end - -require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) - -flutter_macos_podfile_setup - -target 'Runner' do - use_frameworks! - - flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) - target 'RunnerTests' do - inherit! :search_paths - end -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_macos_build_settings(target) - end -end diff --git a/widgetbook/macos/Podfile.lock b/widgetbook/macos/Podfile.lock deleted file mode 100644 index c98ec833..00000000 --- a/widgetbook/macos/Podfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -PODS: - - FlutterMacOS (1.0.0) - - package_info_plus (0.0.1): - - FlutterMacOS - - url_launcher_macos (0.0.1): - - FlutterMacOS - - video_player_avfoundation (0.0.1): - - Flutter - - FlutterMacOS - - wakelock_plus (0.0.1): - - FlutterMacOS - -DEPENDENCIES: - - FlutterMacOS (from `Flutter/ephemeral`) - - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) - - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) - -EXTERNAL SOURCES: - FlutterMacOS: - :path: Flutter/ephemeral - package_info_plus: - :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos - url_launcher_macos: - :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos - video_player_avfoundation: - :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin - wakelock_plus: - :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos - -SPEC CHECKSUMS: - FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 - package_info_plus: f0052d280d17aa382b932f399edf32507174e870 - url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd - video_player_avfoundation: 3453f792138786248960ca029747fcd9f318ef52 - wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b - -PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009 - -COCOAPODS: 1.16.2 diff --git a/widgetbook/macos/Runner.xcodeproj/project.pbxproj b/widgetbook/macos/Runner.xcodeproj/project.pbxproj index 80fa8010..a46a3f27 100644 --- a/widgetbook/macos/Runner.xcodeproj/project.pbxproj +++ b/widgetbook/macos/Runner.xcodeproj/project.pbxproj @@ -27,8 +27,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 47344594C8F41C2AF778983A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF70AB3482060E087DF65A13 /* Pods_RunnerTests.framework */; }; - CF205D1EF978C21A5093C190 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22F3041A261E3530B8853B6E /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,7 +61,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 22F3041A261E3530B8853B6E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -79,15 +77,9 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 38C4A4BF948160DE426A43D1 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 4123034E01AF04CE06347CA9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - 45F931832A7EE5F3CB6B9E9D /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 7088D77F0CD739AB8D3F76E3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - AF70AB3482060E087DF65A13 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F75EB0922AD7962576AA230C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - FBE63872F9A54561AC1D6BCF /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +87,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 47344594C8F41C2AF778983A /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CF205D1EF978C21A5093C190 /* Pods_Runner.framework in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -136,7 +127,6 @@ 33CEB47122A05771004F2AC0 /* Flutter */, 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, - D73912EC22F37F3D000D13A0 /* Frameworks */, 8BDC043D1217DF98374C7C0E /* Pods */, ); sourceTree = ""; @@ -164,6 +154,7 @@ 33CEB47122A05771004F2AC0 /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, @@ -188,25 +179,10 @@ 8BDC043D1217DF98374C7C0E /* Pods */ = { isa = PBXGroup; children = ( - 4123034E01AF04CE06347CA9 /* Pods-Runner.debug.xcconfig */, - 7088D77F0CD739AB8D3F76E3 /* Pods-Runner.release.xcconfig */, - 38C4A4BF948160DE426A43D1 /* Pods-Runner.profile.xcconfig */, - 45F931832A7EE5F3CB6B9E9D /* Pods-RunnerTests.debug.xcconfig */, - F75EB0922AD7962576AA230C /* Pods-RunnerTests.release.xcconfig */, - FBE63872F9A54561AC1D6BCF /* Pods-RunnerTests.profile.xcconfig */, ); path = Pods; sourceTree = ""; }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 22F3041A261E3530B8853B6E /* Pods_Runner.framework */, - AF70AB3482060E087DF65A13 /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -214,7 +190,6 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 6148902D0A84CF09A4544C5E /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -233,13 +208,11 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - BCCBE627E245C985761C0501 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 7DE32ABE7B8EAE697247381A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -247,6 +220,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* widgetbook.app */; productType = "com.apple.product-type.application"; @@ -291,6 +267,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -360,67 +339,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 6148902D0A84CF09A4544C5E /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 7DE32ABE7B8EAE697247381A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - BCCBE627E245C985761C0501 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -472,7 +390,6 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 45F931832A7EE5F3CB6B9E9D /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -487,7 +404,6 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F75EB0922AD7962576AA230C /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -502,7 +418,6 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FBE63872F9A54561AC1D6BCF /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -828,6 +743,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "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/widgetbook/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/widgetbook/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 4572deb8..c3ad0174 100644 --- a/widgetbook/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/widgetbook/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + +