diff --git a/.gitignore b/.gitignore index 99b3f9c..ee24e6d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ migrate_working_dir/ **/doc/api/ .dart_tool/ build/ + +# iOS and macOS dependencies +.build/ +.swiftpm/ diff --git a/quill_native_bridge/CHANGELOG.md b/quill_native_bridge/CHANGELOG.md index acbba00..64b46a4 100644 --- a/quill_native_bridge/CHANGELOG.md +++ b/quill_native_bridge/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## 10.7.10 + +- Support Swift package manager. +- Update minimum required versions for Android, iOS, macOS and web implementation packages. + ## 10.7.9 - Require `quill_native_bridge_platform_interface` minimum version `0.0.1-dev.4`. diff --git a/quill_native_bridge/README.md b/quill_native_bridge/README.md index 333f38f..e39646c 100644 --- a/quill_native_bridge/README.md +++ b/quill_native_bridge/README.md @@ -31,7 +31,7 @@ An exception with less details will be thrown in production mode. **1. Update `AndroidManifest.xml`** -Open `your_project/android/app/src/main/AndroidManifest.xml` and add the following inside the `` tag: +Open `android/app/src/main/AndroidManifest.xml` and add the following inside the `` tag: ```xml @@ -53,7 +53,7 @@ Open `your_project/android/app/src/main/AndroidManifest.xml` and add the followi **2. Create `file_paths.xml`** -Create the file `your_project/android/app/src/main/res/xml/file_paths.xml` with the following content: +Create the file `android/app/src/main/res/xml/file_paths.xml` with the following content: ```xml diff --git a/quill_native_bridge/example/.gitignore b/quill_native_bridge/example/.gitignore index d0e170a..c89ee84 100644 --- a/quill_native_bridge/example/.gitignore +++ b/quill_native_bridge/example/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/quill_native_bridge/example/ios/Podfile.lock b/quill_native_bridge/example/ios/Podfile.lock index c3c4a55..a16608d 100644 --- a/quill_native_bridge/example/ios/Podfile.lock +++ b/quill_native_bridge/example/ios/Podfile.lock @@ -1,28 +1,16 @@ PODS: - Flutter (1.0.0) - - integration_test (0.0.1): - - Flutter - - quill_native_bridge_ios (0.0.1): - - Flutter DEPENDENCIES: - Flutter (from `Flutter`) - - integration_test (from `.symlinks/plugins/integration_test/ios`) - - quill_native_bridge_ios (from `.symlinks/plugins/quill_native_bridge_ios/ios`) EXTERNAL SOURCES: Flutter: :path: Flutter - integration_test: - :path: ".symlinks/plugins/integration_test/ios" - quill_native_bridge_ios: - :path: ".symlinks/plugins/quill_native_bridge_ios/ios" SPEC CHECKSUMS: Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 - quill_native_bridge_ios: 277bdf5bf0fa5d7a12999556b415a5c63dd76ec4 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/quill_native_bridge/example/ios/Runner.xcodeproj/project.pbxproj b/quill_native_bridge/example/ios/Runner.xcodeproj/project.pbxproj index 8bf4b02..1b567f7 100644 --- a/quill_native_bridge/example/ios/Runner.xcodeproj/project.pbxproj +++ b/quill_native_bridge/example/ios/Runner.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 5F41E8A1237947A9C892201F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 409E53903E588B6FEB995A19 /* Pods_Runner.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 */; }; @@ -80,6 +81,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 5F41E8A1237947A9C892201F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -198,13 +200,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 930CBC47A47AC491416D4034 /* [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 +242,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -286,23 +293,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 930CBC47A47AC491416D4034 /* [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; @@ -723,6 +713,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/quill_native_bridge/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/quill_native_bridge/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e3ca5d..c064c07 100644 --- a/quill_native_bridge/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/quill_native_bridge/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + version = "1.7"> + + + + + + + + + + diff --git a/quill_native_bridge/example/macos/Podfile.lock b/quill_native_bridge/example/macos/Podfile.lock index 7d2149e..44d4097 100644 --- a/quill_native_bridge/example/macos/Podfile.lock +++ b/quill_native_bridge/example/macos/Podfile.lock @@ -1,22 +1,16 @@ PODS: - FlutterMacOS (1.0.0) - - quill_native_bridge_macos (0.0.1): - - FlutterMacOS DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - - quill_native_bridge_macos (from `Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos`) EXTERNAL SOURCES: FlutterMacOS: :path: Flutter/ephemeral - quill_native_bridge_macos: - :path: Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos SPEC CHECKSUMS: FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - quill_native_bridge_macos: f90985c5269ac7ba84d933605b463d96e5f544fe PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/quill_native_bridge/example/macos/Runner.xcodeproj/project.pbxproj b/quill_native_bridge/example/macos/Runner.xcodeproj/project.pbxproj index d129dca..4815653 100644 --- a/quill_native_bridge/example/macos/Runner.xcodeproj/project.pbxproj +++ b/quill_native_bridge/example/macos/Runner.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 48F6F64E1D3B068E354AED5A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDE555F7B1A8B2AA27DD31B7 /* Pods_RunnerTests.framework */; }; 588077B9B7948518FF16E803 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830F57774208EDAC364B3ADD /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -103,6 +104,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 588077B9B7948518FF16E803 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -240,7 +242,6 @@ 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - AE8E2B94E6C70C9A86E2E5CD /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -248,6 +249,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* quill_native_bridge_example.app */; productType = "com.apple.product-type.application"; @@ -292,6 +296,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -361,23 +368,6 @@ shellPath = /bin/sh; shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - AE8E2B94E6C70C9A86E2E5CD /* [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; - }; C9E331B712FA33539C773C66 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -796,6 +786,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/quill_native_bridge/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/quill_native_bridge/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index bb32401..fe8a73d 100644 --- a/quill_native_bridge/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/quill_native_bridge/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + diff --git a/quill_native_bridge/example/macos/Runner/AppDelegate.swift b/quill_native_bridge/example/macos/Runner/AppDelegate.swift index 8e02df2..b3c1761 100644 --- a/quill_native_bridge/example/macos/Runner/AppDelegate.swift +++ b/quill_native_bridge/example/macos/Runner/AppDelegate.swift @@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/quill_native_bridge/example/pubspec.lock b/quill_native_bridge/example/pubspec.lock index 5f78aea..d257a9e 100644 --- a/quill_native_bridge/example/pubspec.lock +++ b/quill_native_bridge/example/pubspec.lock @@ -13,18 +13,18 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" crypto: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" flutter: dependency: "direct main" description: flutter @@ -139,18 +139,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -163,10 +163,10 @@ packages: dependency: transitive description: name: lints - sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" + sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.0" matcher: dependency: transitive description: @@ -195,10 +195,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" petitparser: dependency: transitive description: @@ -211,10 +211,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -227,17 +227,17 @@ packages: dependency: transitive description: name: process - sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.0.3" quill_native_bridge: dependency: "direct main" description: path: ".." relative: true source: path - version: "10.7.9" + version: "10.7.10" quill_native_bridge_android: dependency: "direct overridden" description: @@ -251,7 +251,7 @@ packages: path: "../../quill_native_bridge_ios" relative: true source: path - version: "0.0.1-dev.4" + version: "0.0.1-dev.5" quill_native_bridge_linux: dependency: "direct overridden" description: @@ -265,7 +265,7 @@ packages: path: "../../quill_native_bridge_macos" relative: true source: path - version: "0.0.1-dev.3" + version: "0.0.1-dev.4" quill_native_bridge_platform_interface: dependency: "direct overridden" description: @@ -279,7 +279,7 @@ packages: path: "../../quill_native_bridge_web" relative: true source: path - version: "0.0.1-dev.4" + version: "0.0.1-dev.5" quill_native_bridge_windows: dependency: "direct overridden" description: @@ -291,7 +291,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -320,10 +320,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.0" sync_http: dependency: transitive description: @@ -344,10 +344,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" typed_data: dependency: transitive description: @@ -376,10 +376,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.1" web: dependency: transitive description: @@ -392,18 +392,18 @@ packages: dependency: transitive description: name: webdriver - sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" win32: dependency: transitive description: name: win32 - sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454" + sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2" url: "https://pub.dev" source: hosted - version: "5.7.2" + version: "5.8.0" xml: dependency: transitive description: @@ -413,5 +413,5 @@ packages: source: hosted version: "6.5.0" sdks: - dart: ">=3.5.2 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.6.0-0 <4.0.0" + flutter: ">=3.24.0" diff --git a/quill_native_bridge/example/pubspec.yaml b/quill_native_bridge/example/pubspec.yaml index 1f7060a..c9dce92 100644 --- a/quill_native_bridge/example/pubspec.yaml +++ b/quill_native_bridge/example/pubspec.yaml @@ -5,11 +5,12 @@ publish_to: 'none' environment: sdk: ^3.5.2 + flutter: ">=3.24.0" dependencies: flutter: sdk: flutter - quill_native_bridge: ^10.7.9 + quill_native_bridge: ^10.7.10 dependency_overrides: quill_native_bridge: diff --git a/quill_native_bridge/pubspec.yaml b/quill_native_bridge/pubspec.yaml index bdcec0d..6c79634 100644 --- a/quill_native_bridge/pubspec.yaml +++ b/quill_native_bridge/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_native_bridge description: "An internal plugin for flutter_quill package to access platform-specific APIs" -version: 10.7.9 +version: 10.7.10 homepage: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge repository: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge issue_tracker: https://github.com/FlutterQuill/quill-native-bridge/issues @@ -21,13 +21,13 @@ environment: dependencies: flutter: sdk: flutter - quill_native_bridge_android: ^0.0.1-dev.3 + quill_native_bridge_android: ^0.0.1-dev.4 quill_native_bridge_platform_interface: ^0.0.1-dev.4 - quill_native_bridge_web: ^0.0.1-dev.4 + quill_native_bridge_web: ^0.0.1-dev.5 quill_native_bridge_windows: ^0.0.1-dev.3 quill_native_bridge_linux: ^0.0.1-dev.3 - quill_native_bridge_ios: ^0.0.1-dev.4 - quill_native_bridge_macos: ^0.0.1-dev.2 + quill_native_bridge_ios: ^0.0.1-dev.5 + quill_native_bridge_macos: ^0.0.1-dev.4 dev_dependencies: flutter_test: diff --git a/quill_native_bridge_ios/CHANGELOG.md b/quill_native_bridge_ios/CHANGELOG.md index b133ea7..11b5cae 100644 --- a/quill_native_bridge_ios/CHANGELOG.md +++ b/quill_native_bridge_ios/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 0.0.1-dev.5 + +- Support Swift Package Manager. + ## 0.0.1-dev.4 - Added support for WebP image format in `getClipboardImage()` diff --git a/quill_native_bridge_ios/ios/Assets/.gitkeep b/quill_native_bridge_ios/ios/Assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/quill_native_bridge_ios/ios/quill_native_bridge_ios.podspec b/quill_native_bridge_ios/ios/quill_native_bridge_ios.podspec index 6690fa6..55df8a9 100644 --- a/quill_native_bridge_ios/ios/quill_native_bridge_ios.podspec +++ b/quill_native_bridge_ios/ios/quill_native_bridge_ios.podspec @@ -9,11 +9,11 @@ Pod::Spec.new do |s| s.description = <<-DESC An internal plugin for flutter_quill package to access platform-specific APIs. DESC - s.homepage = 'https://github.com/singerdmx/flutter-quill' - s.license = { :file => '../LICENSE' } + s.homepage = 'https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge' + s.license = { :type => 'MIT', :file => '../LICENSE' } s.author = { 'Flutter Quill' => 'https://github.com/singerdmx/flutter-quill' } - s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source = { :http => 'https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_ios' } + s.source_files = 'quill_native_bridge_ios/Sources/quill_native_bridge_ios/**/*.swift' s.dependency 'Flutter' s.platform = :ios, '12.0' @@ -21,9 +21,5 @@ An internal plugin for flutter_quill package to access platform-specific APIs. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } s.swift_version = '5.0' - # If your plugin requires a privacy manifest, for example if it uses any - # required reason APIs, update the PrivacyInfo.xcprivacy file to describe your - # plugin's privacy impact, and then uncomment this line. For more information, - # see https://developer.apple.com/documentation/bundleresources/privacy_manifest_files - # s.resource_bundles = {'quill_native_bridge_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'quill_native_bridge_ios_privacy' => ['quill_native_bridge_ios/Sources/quill_native_bridge_ios/Resources/PrivacyInfo.xcprivacy']} end diff --git a/quill_native_bridge_ios/ios/quill_native_bridge_ios/Package.swift b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Package.swift new file mode 100644 index 0000000..8889d5f --- /dev/null +++ b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Package.swift @@ -0,0 +1,24 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "quill_native_bridge_ios", + platforms: [ + .iOS("12.0"), + ], + products: [ + .library(name: "quill-native-bridge-ios", targets: ["quill_native_bridge_ios"]) + ], + dependencies: [], + targets: [ + .target( + name: "quill_native_bridge_ios", + dependencies: [], + resources: [ + .process("Resources"), + ] + ) + ] +) \ No newline at end of file diff --git a/quill_native_bridge_ios/ios/Classes/Messages.g.swift b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Messages.g.swift similarity index 99% rename from quill_native_bridge_ios/ios/Classes/Messages.g.swift rename to quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Messages.g.swift index ff9d43d..3cbdf35 100644 --- a/quill_native_bridge_ios/ios/Classes/Messages.g.swift +++ b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Messages.g.swift @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.4.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation diff --git a/quill_native_bridge_ios/ios/Classes/QuillNativeBridgeImpl.swift b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/QuillNativeBridgeImpl.swift similarity index 100% rename from quill_native_bridge_ios/ios/Classes/QuillNativeBridgeImpl.swift rename to quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/QuillNativeBridgeImpl.swift diff --git a/quill_native_bridge_ios/ios/Classes/QuillNativeBridgePlugin.swift b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/QuillNativeBridgePlugin.swift similarity index 100% rename from quill_native_bridge_ios/ios/Classes/QuillNativeBridgePlugin.swift rename to quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/QuillNativeBridgePlugin.swift diff --git a/quill_native_bridge_ios/ios/Resources/PrivacyInfo.xcprivacy b/quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from quill_native_bridge_ios/ios/Resources/PrivacyInfo.xcprivacy rename to quill_native_bridge_ios/ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Resources/PrivacyInfo.xcprivacy diff --git a/quill_native_bridge_ios/lib/src/messages.g.dart b/quill_native_bridge_ios/lib/src/messages.g.dart index e12dd5f..fb2f4f4 100644 --- a/quill_native_bridge_ios/lib/src/messages.g.dart +++ b/quill_native_bridge_ios/lib/src/messages.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.4.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -17,6 +17,23 @@ PlatformException _createConnectionError(String channelName) { class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } } class QuillNativeBridgeApi { diff --git a/quill_native_bridge_ios/pigeons/messages.dart b/quill_native_bridge_ios/pigeons/messages.dart index 3f0df4f..5f8a202 100644 --- a/quill_native_bridge_ios/pigeons/messages.dart +++ b/quill_native_bridge_ios/pigeons/messages.dart @@ -2,7 +2,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', - swiftOut: 'ios/Classes/Messages.g.swift', + swiftOut: + 'ios/quill_native_bridge_ios/Sources/quill_native_bridge_ios/Messages.g.swift', dartPackageName: 'quill_native_bridge_ios', )) @HostApi() diff --git a/quill_native_bridge_ios/pubspec.yaml b/quill_native_bridge_ios/pubspec.yaml index 5242424..5a5dede 100644 --- a/quill_native_bridge_ios/pubspec.yaml +++ b/quill_native_bridge_ios/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_native_bridge_ios description: "iOS implementation of the quill_native_bridge plugin." -version: 0.0.1-dev.4 +version: 0.0.1-dev.5 homepage: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_ios repository: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_ios issue_tracker: https://github.com/FlutterQuill/quill-native-bridge/issues?q=is%3Aissue+is%3Aopen+label%3A%22platform-ios%22 @@ -19,9 +19,8 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^5.0.0 - pigeon: ^22.4.0 + pigeon: ^22.6.2 -# TODO: Support Swift Package Manager for both iOS and macOS https://pub.dev/packages/quill_native_bridge/score flutter: plugin: implements: quill_native_bridge diff --git a/quill_native_bridge_macos/CHANGELOG.md b/quill_native_bridge_macos/CHANGELOG.md index b1038fd..ced2d81 100644 --- a/quill_native_bridge_macos/CHANGELOG.md +++ b/quill_native_bridge_macos/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 0.0.1-dev.4 + +- Support Swift Package Manager. + ## 0.0.1-dev.3 - Require `quill_native_bridge_platform_interface` minimum version `0.0.1-dev.4`. diff --git a/quill_native_bridge_macos/lib/src/messages.g.dart b/quill_native_bridge_macos/lib/src/messages.g.dart index 350dec0..86d3ca3 100644 --- a/quill_native_bridge_macos/lib/src/messages.g.dart +++ b/quill_native_bridge_macos/lib/src/messages.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.4.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -17,6 +17,23 @@ PlatformException _createConnectionError(String channelName) { class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); + @override + void writeValue(WriteBuffer buffer, Object? value) { + if (value is int) { + buffer.putUint8(4); + buffer.putInt64(value); + } else { + super.writeValue(buffer, value); + } + } + + @override + Object? readValueOfType(int type, ReadBuffer buffer) { + switch (type) { + default: + return super.readValueOfType(type, buffer); + } + } } class QuillNativeBridgeApi { diff --git a/quill_native_bridge_macos/macos/quill_native_bridge_macos.podspec b/quill_native_bridge_macos/macos/quill_native_bridge_macos.podspec index 4df2974..88acff9 100644 --- a/quill_native_bridge_macos/macos/quill_native_bridge_macos.podspec +++ b/quill_native_bridge_macos/macos/quill_native_bridge_macos.podspec @@ -9,15 +9,16 @@ Pod::Spec.new do |s| s.description = <<-DESC An internal plugin for flutter_quill package to access platform-specific APIs. DESC - s.homepage = 'https://github.com/singerdmx/flutter-quill' - s.license = { :file => '../LICENSE' } + s.homepage = 'https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge' + s.license = { :type => 'MIT', :file => '../LICENSE' } s.author = { 'Flutter Quill' => 'https://github.com/singerdmx/flutter-quill' } - - s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source = { :http => 'https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_macos' } + s.source_files = 'quill_native_bridge_macos/Sources/quill_native_bridge_macos/**/*.swift' s.dependency 'FlutterMacOS' - s.platform = :osx, '10.11' + s.platform = :osx, '10.14' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' + + s.resource_bundles = {'quill_native_bridge_macos_privacy' => ['quill_native_bridge_macos/Sources/quill_native_bridge_macos/Resources/PrivacyInfo.xcprivacy']} end diff --git a/quill_native_bridge_macos/macos/quill_native_bridge_macos/Package.swift b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Package.swift new file mode 100644 index 0000000..df6988a --- /dev/null +++ b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Package.swift @@ -0,0 +1,24 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "quill_native_bridge_macos", + platforms: [ + .macOS("10.14") + ], + products: [ + .library(name: "quill-native-bridge-macos", targets: ["quill_native_bridge_macos"]) + ], + dependencies: [], + targets: [ + .target( + name: "quill_native_bridge_macos", + dependencies: [], + resources: [ + .process("Resources") + ] + ) + ] +) \ No newline at end of file diff --git a/quill_native_bridge_macos/macos/Classes/Messages.g.swift b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Messages.g.swift similarity index 99% rename from quill_native_bridge_macos/macos/Classes/Messages.g.swift rename to quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Messages.g.swift index 1bf9c3b..902c50e 100644 --- a/quill_native_bridge_macos/macos/Classes/Messages.g.swift +++ b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Messages.g.swift @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v22.4.0), do not edit directly. +// Autogenerated from Pigeon (v22.6.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation diff --git a/quill_native_bridge_macos/macos/Classes/QuillNativeBridgeImpl.swift b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/QuillNativeBridgeImpl.swift similarity index 100% rename from quill_native_bridge_macos/macos/Classes/QuillNativeBridgeImpl.swift rename to quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/QuillNativeBridgeImpl.swift diff --git a/quill_native_bridge_macos/macos/Classes/QuillNativeBridgePlugin.swift b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/QuillNativeBridgePlugin.swift similarity index 100% rename from quill_native_bridge_macos/macos/Classes/QuillNativeBridgePlugin.swift rename to quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/QuillNativeBridgePlugin.swift diff --git a/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Resources/PrivacyInfo.xcprivacy b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 0000000..c88e30f --- /dev/null +++ b/quill_native_bridge_macos/macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,12 @@ + + + + + NSPrivacyTrackingDomains + + NSPrivacyCollectedDataTypes + + NSPrivacyTracking + + + \ No newline at end of file diff --git a/quill_native_bridge_macos/pigeons/messages.dart b/quill_native_bridge_macos/pigeons/messages.dart index 3048b62..70822f0 100644 --- a/quill_native_bridge_macos/pigeons/messages.dart +++ b/quill_native_bridge_macos/pigeons/messages.dart @@ -2,7 +2,8 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', - swiftOut: 'macos/Classes/Messages.g.swift', + swiftOut: + 'macos/quill_native_bridge_macos/Sources/quill_native_bridge_macos/Messages.g.swift', dartPackageName: 'quill_native_bridge_macos', )) @HostApi() diff --git a/quill_native_bridge_macos/pubspec.yaml b/quill_native_bridge_macos/pubspec.yaml index 6b81b89..956fb36 100644 --- a/quill_native_bridge_macos/pubspec.yaml +++ b/quill_native_bridge_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_native_bridge_macos description: "macOS implementation of the quill_native_bridge plugin." -version: 0.0.1-dev.3 +version: 0.0.1-dev.4 homepage: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_macos repository: https://github.com/FlutterQuill/quill-native-bridge/tree/main/quill_native_bridge_macos issue_tracker: https://github.com/FlutterQuill/quill-native-bridge/issues?q=is%3Aissue+is%3Aopen+label%3A%22platform-macos%22 @@ -19,7 +19,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^5.0.0 - pigeon: ^22.4.0 + pigeon: ^22.6.2 flutter: plugin: