diff --git a/.tool-versions b/.tool-versions index 911cbae..bc48711 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -flutter 3.19.3-stable +flutter 3.27.3-stable diff --git a/flutter_custom_tabs/example/.gitignore b/flutter_custom_tabs/example/.gitignore index c593c17..bb7970f 100644 --- a/flutter_custom_tabs/example/.gitignore +++ b/flutter_custom_tabs/example/.gitignore @@ -5,9 +5,12 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ +migrate_working_dir/ # IntelliJ related *.iml @@ -30,10 +33,8 @@ .pub-cache/ .pub/ /build/ -.flutter-plugins-dependencies - -# Web related -lib/generated_plugin_registrant.dart +# Remove the following pattern if you wish to check in your lock file +pubspec.lock # Symbolication related app.*.symbols diff --git a/flutter_custom_tabs/example/ios/.gitignore b/flutter_custom_tabs/example/ios/.gitignore index e96ef60..7a7f987 100644 --- a/flutter_custom_tabs/example/ios/.gitignore +++ b/flutter_custom_tabs/example/ios/.gitignore @@ -1,3 +1,4 @@ +**/dgph *.mode1v3 *.mode2v3 *.moved-aside @@ -18,6 +19,7 @@ Flutter/App.framework Flutter/Flutter.framework Flutter/Flutter.podspec Flutter/Generated.xcconfig +Flutter/ephemeral/ Flutter/app.flx Flutter/app.zip Flutter/flutter_assets/ diff --git a/flutter_custom_tabs/example/ios/Podfile.lock b/flutter_custom_tabs/example/ios/Podfile.lock index ed7d8ae..b70a53f 100644 --- a/flutter_custom_tabs/example/ios/Podfile.lock +++ b/flutter_custom_tabs/example/ios/Podfile.lock @@ -1,21 +1,15 @@ PODS: - Flutter (1.0.0) - - flutter_custom_tabs_ios (2.4.1): - - Flutter DEPENDENCIES: - Flutter (from `Flutter`) - - flutter_custom_tabs_ios (from `.symlinks/plugins/flutter_custom_tabs_ios/ios`) EXTERNAL SOURCES: Flutter: :path: Flutter - flutter_custom_tabs_ios: - :path: ".symlinks/plugins/flutter_custom_tabs_ios/ios" SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_custom_tabs_ios: 778a36f3f80e55bbd1a23d2b0582b0afdc38b4c5 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 diff --git a/flutter_custom_tabs/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_custom_tabs/example/ios/Runner.xcodeproj/project.pbxproj index 735118a..36fef17 100644 --- a/flutter_custom_tabs/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_custom_tabs/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 84426E5A130F0DE24E257120 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA6128FA450C4B4B05E3ECEB /* Pods_Runner.framework */; }; DA1E293426579F8200C77C67 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA1E293326579F8200C77C67 /* AppDelegate.swift */; }; DA1E293D2657A37E00C77C67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA1E29372657A37E00C77C67 /* Assets.xcassets */; }; @@ -53,6 +54,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 84426E5A130F0DE24E257120 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -144,13 +146,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 2ABC1AF2CB0B6DF1CC9B04EC /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -179,6 +183,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -221,23 +228,6 @@ 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; }; - 2ABC1AF2CB0B6DF1CC9B04EC /* [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; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -482,6 +472,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/flutter_custom_tabs/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_custom_tabs/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 7033c69..31ab5b7 100644 --- a/flutter_custom_tabs/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter_custom_tabs/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + =3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs/pubspec.yaml b/flutter_custom_tabs/pubspec.yaml index 10fe992..f784d72 100644 --- a/flutter_custom_tabs/pubspec.yaml +++ b/flutter_custom_tabs/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/droibit/flutter_custom_tabs/issues publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_android/example/pubspec.yaml b/flutter_custom_tabs_android/example/pubspec.yaml index ab0aacb..515ed94 100644 --- a/flutter_custom_tabs_android/example/pubspec.yaml +++ b/flutter_custom_tabs_android/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the flutter_custom_tabs_android plugin. publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_android/pubspec.yaml b/flutter_custom_tabs_android/pubspec.yaml index cf28486..2950ad8 100644 --- a/flutter_custom_tabs_android/pubspec.yaml +++ b/flutter_custom_tabs_android/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/droibit/flutter_custom_tabs/issues publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" flutter: plugin: diff --git a/flutter_custom_tabs_ios/.swiftformat b/flutter_custom_tabs_ios/.swiftformat index d1abcc8..64a2472 100644 --- a/flutter_custom_tabs_ios/.swiftformat +++ b/flutter_custom_tabs_ios/.swiftformat @@ -1,6 +1,6 @@ # file options ---exclude Carthage,Pods,.swiftpm,ios/**/messages.g.swift +--exclude Carthage,Pods,.swiftpm,ios/**/messages.g.swift,example/ios/Flutter/** # format options diff --git a/flutter_custom_tabs_ios/.swiftlint.yml b/flutter_custom_tabs_ios/.swiftlint.yml index 9bcc48e..e94029c 100644 --- a/flutter_custom_tabs_ios/.swiftlint.yml +++ b/flutter_custom_tabs_ios/.swiftlint.yml @@ -158,6 +158,7 @@ included: - example/ios/RunnerTests excluded: - "ios/**/messages.g.swift" + - "example/ios/Flutter/**" line_length: - 200 # warning diff --git a/flutter_custom_tabs_ios/example/ios/Podfile.lock b/flutter_custom_tabs_ios/example/ios/Podfile.lock index bd2abb7..b1e1281 100644 --- a/flutter_custom_tabs_ios/example/ios/Podfile.lock +++ b/flutter_custom_tabs_ios/example/ios/Podfile.lock @@ -1,27 +1,15 @@ PODS: - Flutter (1.0.0) - - flutter_custom_tabs_ios (2.4.1): - - Flutter - - integration_test (0.0.1): - - Flutter DEPENDENCIES: - Flutter (from `Flutter`) - - flutter_custom_tabs_ios (from `.symlinks/plugins/flutter_custom_tabs_ios/ios`) - - integration_test (from `.symlinks/plugins/integration_test/ios`) EXTERNAL SOURCES: Flutter: :path: Flutter - flutter_custom_tabs_ios: - :path: ".symlinks/plugins/flutter_custom_tabs_ios/ios" - integration_test: - :path: ".symlinks/plugins/integration_test/ios" SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_custom_tabs_ios: 778a36f3f80e55bbd1a23d2b0582b0afdc38b4c5 - integration_test: 13825b8a9334a850581300559b8839134b124670 PODFILE CHECKSUM: 2f40fced8ccaa4f568954e339e48cea7e274cbdb diff --git a/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj index 93b2b43..33c1563 100644 --- a/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 509711DBE19812B230FCEA66 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E11A124E7F253412B003484 /* Pods_RunnerTests.framework */; }; 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 */; }; @@ -76,6 +77,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 08440E1A39E01FF7298CF81D /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -192,13 +194,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 788084FC781C271F7CF0D964 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -252,6 +256,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -300,23 +307,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 788084FC781C271F7CF0D964 /* [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; @@ -788,6 +778,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/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index d12e6e0..eda5165 100644 --- a/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + =3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_ios/pubspec.yaml b/flutter_custom_tabs_ios/pubspec.yaml index 40a1484..b4e2e16 100644 --- a/flutter_custom_tabs_ios/pubspec.yaml +++ b/flutter_custom_tabs_ios/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/droibit/flutter_custom_tabs/issues publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_platform_interface/pubspec.yaml b/flutter_custom_tabs_platform_interface/pubspec.yaml index 70c501e..a9a155d 100644 --- a/flutter_custom_tabs_platform_interface/pubspec.yaml +++ b/flutter_custom_tabs_platform_interface/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/droibit/flutter_custom_tabs/issues publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_web/example/pubspec.yaml b/flutter_custom_tabs_web/example/pubspec.yaml index ddfea3e..cb3fcb3 100644 --- a/flutter_custom_tabs_web/example/pubspec.yaml +++ b/flutter_custom_tabs_web/example/pubspec.yaml @@ -2,8 +2,8 @@ name: regular_integration_tests publish_to: none environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" dependencies: flutter: diff --git a/flutter_custom_tabs_web/pubspec.yaml b/flutter_custom_tabs_web/pubspec.yaml index d2c5b4b..88e713e 100644 --- a/flutter_custom_tabs_web/pubspec.yaml +++ b/flutter_custom_tabs_web/pubspec.yaml @@ -7,8 +7,8 @@ issue_tracker: https://github.com/droibit/flutter_custom_tabs/issues publish_to: 'none' environment: - sdk: ^3.3.0 - flutter: ">=3.19.0" + sdk: ^3.6.0 + flutter: ">=3.27.0" flutter: plugin: