diff --git a/.gitignore b/.gitignore index f03e6ffb..a6dfbe0c 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,11 @@ example/android/app/google-services.json xcuserdata/ **/.flutter-plugins-dependencies +# Swift Package Manager +.build/ +.swiftpm/ +!.gitkeep + # Exceptions to above rules. !**/ios/**/default.mode1v3 !**/ios/**/default.mode2v3 diff --git a/packages/example/ios/Podfile.lock b/packages/example/ios/Podfile.lock index c8edb1f8..aa3409ae 100644 --- a/packages/example/ios/Podfile.lock +++ b/packages/example/ios/Podfile.lock @@ -1,5 +1,9 @@ PODS: + - camera_avfoundation (0.0.1): + - Flutter - Flutter (1.0.0) + - flutter_pdfview (1.0.2): + - Flutter - google_mlkit_barcode_scanning (0.14.2): - Flutter - google_mlkit_commons @@ -152,6 +156,8 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/Privacy - GTMSessionFetcher/Core (3.5.0) + - image_picker_ios (0.0.1): + - Flutter - MLImage (1.0.0-beta8) - MLKitBarcodeScanning (8.0.0): - MLKitCommon (~> 14.0) @@ -272,11 +278,16 @@ PODS: - nanopb/encode (= 3.30910.0) - nanopb/decode (3.30910.0) - nanopb/encode (3.30910.0) + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS - PromisesObjC (2.4.0) - SSZipArchive (2.6.0) DEPENDENCIES: + - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - Flutter (from `Flutter`) + - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`) - google_mlkit_barcode_scanning (from `.symlinks/plugins/google_mlkit_barcode_scanning/ios`) - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`) - google_mlkit_digital_ink_recognition (from `.symlinks/plugins/google_mlkit_digital_ink_recognition/ios`) @@ -303,6 +314,8 @@ DEPENDENCIES: - GoogleMLKit/TextRecognitionDevanagari (~> 9.0.0) - GoogleMLKit/TextRecognitionJapanese (~> 9.0.0) - GoogleMLKit/TextRecognitionKorean (~> 9.0.0) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) SPEC REPOS: trunk: @@ -347,8 +360,12 @@ SPEC REPOS: - SSZipArchive EXTERNAL SOURCES: + camera_avfoundation: + :path: ".symlinks/plugins/camera_avfoundation/ios" Flutter: :path: Flutter + flutter_pdfview: + :path: ".symlinks/plugins/flutter_pdfview/ios" google_mlkit_barcode_scanning: :path: ".symlinks/plugins/google_mlkit_barcode_scanning/ios" google_mlkit_commons: @@ -393,36 +410,43 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/google_mlkit_text_recognition/ios" google_mlkit_translation: :path: ".symlinks/plugins/google_mlkit_translation/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" SPEC CHECKSUMS: + camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - google_mlkit_barcode_scanning: 12d8422d8f7b00726dedf9cac00188a2b98750c2 - google_mlkit_commons: a5e4ffae5bc59ea4c7b9025dc72cb6cb79dc1166 - google_mlkit_digital_ink_recognition: a9f14c9a75bad980ea26f2d3ce277f5963f413ba - google_mlkit_document_scanner: 107c2c91ea967acb9eb989ff988443b81b8e761a - google_mlkit_entity_extraction: 45de8519319089085569ef9e10e2500b8d0d55a0 - google_mlkit_face_detection: ee4b72cfae062b4c972204be955d83055a4bfd36 - google_mlkit_face_mesh_detection: 644aad01e609e0962bc38495d1d807e2ae9f5e1b - google_mlkit_genai_image_description: 84e90c2ad87ae5e2f05cc4d5f1924059c799fc12 - google_mlkit_genai_prompt: f4a41c9548172a86c6723e5c83c1c3295b6ad299 - google_mlkit_genai_proofreading: 09ca9edfaa66e58ff165d2047286c10ba0a831ca - google_mlkit_genai_rewriting: 7a647b345cf7d9fe8fda004142ca980abbba9724 - google_mlkit_genai_speech_recognition: 783fd846946877dc812a81d629c676b41973ce72 - google_mlkit_genai_summarization: 8d750cfca622746aef09d6521bf2e764e8647ded - google_mlkit_image_labeling: 6f6fdb11c14600e01898e59a8c4413b255ede272 - google_mlkit_language_id: de6f5cc02967420549c3c3a1624b359217442db9 - google_mlkit_object_detection: 6a81b32faf7a9b700bed7a2caa67254818553257 - google_mlkit_pose_detection: 211eabf55f5ea8d6a9537fdade0a37148fc84d8b - google_mlkit_selfie_segmentation: 0317616b7e460f242bd13a805b70f4e0ba636336 - google_mlkit_smart_reply: fa236bc7f5f8ed70a894a659ec8d43b5b05374a6 - google_mlkit_subject_segmentation: 864c91cd7c89cedc4b17021794c6c182ba165e0f - google_mlkit_text_recognition: b3de5adb786ad7a0fe8e13618387b8d2df0f3c70 - google_mlkit_translation: c5a10fefc8f641df87a49d2744b2b1bf0c418064 + flutter_pdfview: 32bf27bda6fd85b9dd2c09628a824df5081246cf + google_mlkit_barcode_scanning: 95159ac026ae195831f17d52cfc4a72abcdc1f40 + google_mlkit_commons: bc624d0cd6eb0ab391f4d3fcc9598fd59e0735f9 + google_mlkit_digital_ink_recognition: 319fb603c8b0d5d627757ded2cbf0ea57a2b4aad + google_mlkit_document_scanner: 1bfb0767a3b7283d70884257f314f167bd8a59d9 + google_mlkit_entity_extraction: ab6d6d27bfadba368143d47e354bedff937dfdeb + google_mlkit_face_detection: 2d566a890b13df620e7d1e9bfb4ed7705ed60994 + google_mlkit_face_mesh_detection: 4c3158115a271e23402237588f6f43f697b9003f + google_mlkit_genai_image_description: a407a75d7564ca0faa43accc4963111b9993da3a + google_mlkit_genai_prompt: 482b05efbff11cd511821578f05b30d8503157b9 + google_mlkit_genai_proofreading: 9edbbe6d853c56ef21747418f314edfc218afb13 + google_mlkit_genai_rewriting: 4205254192a33fa56a0f792b117e408566439c71 + google_mlkit_genai_speech_recognition: d761013dc988367715ad8c0dcf33db03c364292a + google_mlkit_genai_summarization: 34bdd0e7b5398ab0c3536d457e55e72c82d2411d + google_mlkit_image_labeling: 0f86f08a0965d78aa927f16569e0efef04282f8a + google_mlkit_language_id: 7d161b0306a07d298bb23f0ac1c67473b9080573 + google_mlkit_object_detection: 4472be53c8bd9352e224dcc0803039f8e525f9ac + google_mlkit_pose_detection: 26938d4e3f95fa8f013299115f2aa741e893f419 + google_mlkit_selfie_segmentation: 8dc585002a68a27c2ace15c0eb48b328bc658185 + google_mlkit_smart_reply: f1e2fe84fccf4d5dc74bd11d54f0558d63f53461 + google_mlkit_subject_segmentation: 344a5c32d8a4c465fabd39709e16d6cc8ce9b157 + google_mlkit_text_recognition: d32c40fa27fecb5ab2d0efe8f951fba21cc0fa55 + google_mlkit_translation: 740f287ac2d4b803ed3544e164aa39dd1952df66 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMLKit: b1eee21a41c57704fe72483b15c85cb2c0cd7444 GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 MLImage: 0de5c6c2bf9e93b80ef752e2797f0836f03b58c0 MLKitBarcodeScanning: 39de223e7b1b8a8fbf10816a536dd292d8a39343 MLKitCommon: 47d47b50a031d00db62f1b0efe5a1d8b09a3b2e6 @@ -455,6 +479,7 @@ SPEC CHECKSUMS: MLKitVisionKit: 316cd349468797ef4e7fd785bf658ca838984de3 MLKitXenoCommon: 1a4268c1222a6043047af5bb9435028206c63287 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 + path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea diff --git a/packages/example/ios/Runner.xcodeproj/project.pbxproj b/packages/example/ios/Runner.xcodeproj/project.pbxproj index 54cd2fa0..513efa12 100644 --- a/packages/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 19BEEF351D804C298C54516F /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 185FF648C8C3525E10052A2C /* libPods-Runner.a */; }; 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 */; }; + B01271BE303A7B71AA89DCE4 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA07DD3FFEAFA421DBC82B02 /* libPods-Runner.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -41,19 +41,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 07F1C45CAB683E2489041B44 /* 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 = ""; }; + 012EDC4F1E4DF504CB51A7AC /* 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 = ""; }; 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 = ""; }; - 185FF648C8C3525E10052A2C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; + 5AD813AE4E46CEEA823EFA5D /* 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 = ""; }; 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 = ""; }; 7AFA3C8F1D35360C0083082F /* Profile.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Profile.xcconfig; path = Flutter/Profile.xcconfig; sourceTree = ""; }; - 8A014A7A90898F823F3D4B3D /* 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 = ""; }; - 923A943AD1A8668FF24F5D59 /* 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 = ""; }; 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; }; @@ -61,6 +59,8 @@ 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 = ""; }; + 9CB8AADCEEF10C4E6FFD8D55 /* 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 = ""; }; + BA07DD3FFEAFA421DBC82B02 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,29 +69,29 @@ buildActionMask = 2147483647; files = ( 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, - 19BEEF351D804C298C54516F /* libPods-Runner.a in Frameworks */, + B01271BE303A7B71AA89DCE4 /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5AF1CF50FEB2DDD24045D4DC /* Pods */ = { + 118D83BB50450C8219025BBB /* Frameworks */ = { isa = PBXGroup; children = ( - 8A014A7A90898F823F3D4B3D /* Pods-Runner.debug.xcconfig */, - 923A943AD1A8668FF24F5D59 /* Pods-Runner.release.xcconfig */, - 07F1C45CAB683E2489041B44 /* Pods-Runner.profile.xcconfig */, + BA07DD3FFEAFA421DBC82B02 /* libPods-Runner.a */, ); - path = Pods; + name = Frameworks; sourceTree = ""; }; - 8B326F84B2536FFF50DFEFD3 /* Frameworks */ = { + 5AF1CF50FEB2DDD24045D4DC /* Pods */ = { isa = PBXGroup; children = ( - 185FF648C8C3525E10052A2C /* libPods-Runner.a */, + 5AD813AE4E46CEEA823EFA5D /* Pods-Runner.debug.xcconfig */, + 012EDC4F1E4DF504CB51A7AC /* Pods-Runner.release.xcconfig */, + 9CB8AADCEEF10C4E6FFD8D55 /* Pods-Runner.profile.xcconfig */, ); - name = Frameworks; + path = Pods; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -114,7 +114,7 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 5AF1CF50FEB2DDD24045D4DC /* Pods */, - 8B326F84B2536FFF50DFEFD3 /* Frameworks */, + 118D83BB50450C8219025BBB /* Frameworks */, ); sourceTree = ""; }; @@ -166,14 +166,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 80DABC9846A6DDC8F0D21E5C /* [CP] Check Pods Manifest.lock */, + 19342DE78F72CDC53E9E4E0B /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 0B0823EF0E30F27C01C5808D /* [CP] Copy Pods Resources */, + 72ED689197A3821A269E6100 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -251,21 +251,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0B0823EF0E30F27C01C5808D /* [CP] Copy Pods Resources */ = { + 19342DE78F72CDC53E9E4E0B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + 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 */ = { @@ -284,26 +289,21 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 80DABC9846A6DDC8F0D21E5C /* [CP] Check Pods Manifest.lock */ = { + 72ED689197A3821A269E6100 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; 9740EEB61CF901F6004384FC /* Run Script */ = { diff --git a/packages/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/packages/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/packages/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5..00000000 --- a/packages/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/packages/google_mlkit_barcode_scanning/ios/Assets/.gitkeep b/packages/google_mlkit_barcode_scanning/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning.podspec b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning.podspec index 0fa21e68..aadf9c12 100644 --- a/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning.podspec +++ b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/**/*.{h,m}' + s.public_header_files = 'google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/BarcodeScanning', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Package.swift b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Package.swift new file mode 100644 index 00000000..3b792edd --- /dev/null +++ b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_barcode_scanning", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-barcode-scanning", + targets: ["google_mlkit_barcode_scanning"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_barcode_scanning", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_barcode_scanning", + publicHeadersPath: "include/google_mlkit_barcode_scanning", + cSettings: [ + .headerSearchPath("include/google_mlkit_barcode_scanning") + ] + ), + ] +) diff --git a/packages/google_mlkit_barcode_scanning/ios/Classes/GoogleMlKitBarcodeScanningPlugin.m b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.m similarity index 99% rename from packages/google_mlkit_barcode_scanning/ios/Classes/GoogleMlKitBarcodeScanningPlugin.m rename to packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.m index 118493a9..b05a0dd5 100644 --- a/packages/google_mlkit_barcode_scanning/ios/Classes/GoogleMlKitBarcodeScanningPlugin.m +++ b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitBarcodeScanningPlugin.h" +#import "./include/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.h" #import #import diff --git a/packages/google_mlkit_barcode_scanning/ios/Classes/GoogleMlKitBarcodeScanningPlugin.h b/packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/include/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.h similarity index 100% rename from packages/google_mlkit_barcode_scanning/ios/Classes/GoogleMlKitBarcodeScanningPlugin.h rename to packages/google_mlkit_barcode_scanning/ios/google_mlkit_barcode_scanning/Sources/google_mlkit_barcode_scanning/include/google_mlkit_barcode_scanning/GoogleMlKitBarcodeScanningPlugin.h diff --git a/packages/google_mlkit_commons/ios/Assets/.gitkeep b/packages/google_mlkit_commons/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_commons/ios/google_mlkit_commons.podspec b/packages/google_mlkit_commons/ios/google_mlkit_commons.podspec index 4927ec62..335b0232 100644 --- a/packages/google_mlkit_commons/ios/google_mlkit_commons.podspec +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_commons/Sources/google_mlkit_commons/**/*.{h,m}' + s.public_header_files = 'google_mlkit_commons/Sources/google_mlkit_commons/include/**/*.h' s.dependency 'Flutter' s.dependency 'MLKitVision', '~> 10.0.0' s.platform = :ios, '15.5' diff --git a/packages/google_mlkit_commons/ios/google_mlkit_commons/Package.swift b/packages/google_mlkit_commons/ios/google_mlkit_commons/Package.swift new file mode 100644 index 00000000..e78cdf64 --- /dev/null +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_commons", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-commons", + targets: ["google_mlkit_commons"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_commons", + dependencies: [], + path: "Sources/google_mlkit_commons", + publicHeadersPath: "include/google_mlkit_commons", + cSettings: [ + .headerSearchPath("include/google_mlkit_commons") + ] + ), + ] +) diff --git a/packages/google_mlkit_commons/ios/Classes/GenericModelManager.m b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GenericModelManager.m similarity index 97% rename from packages/google_mlkit_commons/ios/Classes/GenericModelManager.m rename to packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GenericModelManager.m index 97928e28..0d73b20a 100644 --- a/packages/google_mlkit_commons/ios/Classes/GenericModelManager.m +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GenericModelManager.m @@ -1,4 +1,4 @@ -#import "GenericModelManager.h" +#import "./include/google_mlkit_commons/GenericModelManager.h" @implementation GenericModelManager { FlutterResult downloadInkResult; diff --git a/packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.m b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GoogleMlKitCommonsPlugin.m similarity index 90% rename from packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.m rename to packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GoogleMlKitCommonsPlugin.m index 1eb6e73e..77fc1509 100644 --- a/packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.m +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/GoogleMlKitCommonsPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitCommonsPlugin.h" +#import "./include/google_mlkit_commons/GoogleMlKitCommonsPlugin.h" #define channelName @"google_mlkit_commons" diff --git a/packages/google_mlkit_commons/ios/Classes/MLKVisionImage+FlutterPlugin.m b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/MLKVisionImage+FlutterPlugin.m similarity index 98% rename from packages/google_mlkit_commons/ios/Classes/MLKVisionImage+FlutterPlugin.m rename to packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/MLKVisionImage+FlutterPlugin.m index 466f5a2c..1b94955a 100644 --- a/packages/google_mlkit_commons/ios/Classes/MLKVisionImage+FlutterPlugin.m +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/MLKVisionImage+FlutterPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitCommonsPlugin.h" +#import "./include/google_mlkit_commons/GoogleMlKitCommonsPlugin.h" #import @implementation MLKVisionImage(FlutterPlugin) diff --git a/packages/google_mlkit_commons/ios/Classes/GenericModelManager.h b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/include/google_mlkit_commons/GenericModelManager.h similarity index 100% rename from packages/google_mlkit_commons/ios/Classes/GenericModelManager.h rename to packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/include/google_mlkit_commons/GenericModelManager.h diff --git a/packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.h b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/include/google_mlkit_commons/GoogleMlKitCommonsPlugin.h similarity index 93% rename from packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.h rename to packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/include/google_mlkit_commons/GoogleMlKitCommonsPlugin.h index cdae2a63..772fd0c9 100644 --- a/packages/google_mlkit_commons/ios/Classes/GoogleMlKitCommonsPlugin.h +++ b/packages/google_mlkit_commons/ios/google_mlkit_commons/Sources/google_mlkit_commons/include/google_mlkit_commons/GoogleMlKitCommonsPlugin.h @@ -1,6 +1,6 @@ #import #import -#import "GenericModelManager.h" +#import "./GenericModelManager.h" @interface GoogleMlKitCommonsPlugin : NSObject @end diff --git a/packages/google_mlkit_digital_ink_recognition/ios/Assets/.gitkeep b/packages/google_mlkit_digital_ink_recognition/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition.podspec b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition.podspec index 57462718..e789efcf 100644 --- a/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition.podspec +++ b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/**/*.{h,m}' + s.public_header_files = 'google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/DigitalInkRecognition', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Package.swift b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Package.swift new file mode 100644 index 00000000..ba18c648 --- /dev/null +++ b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_digital_ink_recognition", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-digital-ink-recognition", + targets: ["google_mlkit_digital_ink_recognition"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_digital_ink_recognition", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_digital_ink_recognition", + publicHeadersPath: "include/google_mlkit_digital_ink_recognition", + cSettings: [ + .headerSearchPath("include/google_mlkit_digital_ink_recognition") + ] + ), + ] +) diff --git a/packages/google_mlkit_digital_ink_recognition/ios/Classes/GoogleMlKitDigitalInkRecognitionPlugin.m b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.m similarity index 98% rename from packages/google_mlkit_digital_ink_recognition/ios/Classes/GoogleMlKitDigitalInkRecognitionPlugin.m rename to packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.m index 181a27e3..00371983 100644 --- a/packages/google_mlkit_digital_ink_recognition/ios/Classes/GoogleMlKitDigitalInkRecognitionPlugin.m +++ b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitDigitalInkRecognitionPlugin.h" +#import "./include/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.h" #import #import #import diff --git a/packages/google_mlkit_digital_ink_recognition/ios/Classes/GoogleMlKitDigitalInkRecognitionPlugin.h b/packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/include/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.h similarity index 100% rename from packages/google_mlkit_digital_ink_recognition/ios/Classes/GoogleMlKitDigitalInkRecognitionPlugin.h rename to packages/google_mlkit_digital_ink_recognition/ios/google_mlkit_digital_ink_recognition/Sources/google_mlkit_digital_ink_recognition/include/google_mlkit_digital_ink_recognition/GoogleMlKitDigitalInkRecognitionPlugin.h diff --git a/packages/google_mlkit_document_scanner/ios/Assets/.gitkeep b/packages/google_mlkit_document_scanner/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner.podspec b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner.podspec index 98c46549..92041b8a 100644 --- a/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner.podspec +++ b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.author = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/**/*.{h,m}' + s.public_header_files = 'google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/include/**/*.h' s.dependency 'Flutter' # s.dependency 'GoogleMLKit/DocumentScanner', '~> 5.0.0' s.platform = :ios, '15.5' diff --git a/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Package.swift b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Package.swift new file mode 100644 index 00000000..6652cd05 --- /dev/null +++ b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_document_scanner", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-document-scanner", + targets: ["google_mlkit_document_scanner"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_document_scanner", + dependencies: [], + path: "Sources/google_mlkit_document_scanner", + publicHeadersPath: "include/google_mlkit_document_scanner", + cSettings: [ + .headerSearchPath("include/google_mlkit_document_scanner") + ] + ), + ] +) diff --git a/packages/google_mlkit_document_scanner/ios/Classes/GoogleMlKitDocumentScannerPlugin.m b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.m similarity index 89% rename from packages/google_mlkit_document_scanner/ios/Classes/GoogleMlKitDocumentScannerPlugin.m rename to packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.m index 4b10dcab..d83182e0 100644 --- a/packages/google_mlkit_document_scanner/ios/Classes/GoogleMlKitDocumentScannerPlugin.m +++ b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitDocumentScannerPlugin.h" +#import "./include/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.h" @implementation GoogleMlKitDocumentScannerPlugin + (void)registerWithRegistrar:(NSObject*)registrar { diff --git a/packages/google_mlkit_document_scanner/ios/Classes/GoogleMlKitDocumentScannerPlugin.h b/packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/include/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.h similarity index 100% rename from packages/google_mlkit_document_scanner/ios/Classes/GoogleMlKitDocumentScannerPlugin.h rename to packages/google_mlkit_document_scanner/ios/google_mlkit_document_scanner/Sources/google_mlkit_document_scanner/include/google_mlkit_document_scanner/GoogleMlKitDocumentScannerPlugin.h diff --git a/packages/google_mlkit_entity_extraction/ios/Assets/.gitkeep b/packages/google_mlkit_entity_extraction/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction.podspec b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction.podspec index f5e8a35e..70318729 100644 --- a/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction.podspec +++ b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/**/*.{h,m}' + s.public_header_files = 'google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/EntityExtraction', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Package.swift b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Package.swift new file mode 100644 index 00000000..fc581f0e --- /dev/null +++ b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_entity_extraction", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-entity-extraction", + targets: ["google_mlkit_entity_extraction"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_entity_extraction", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_entity_extraction", + publicHeadersPath: "include/google_mlkit_entity_extraction", + cSettings: [ + .headerSearchPath("include/google_mlkit_entity_extraction") + ] + ), + ] +) diff --git a/packages/google_mlkit_entity_extraction/ios/Classes/GoogleMlKitEntityExtractionPlugin.m b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.m similarity index 99% rename from packages/google_mlkit_entity_extraction/ios/Classes/GoogleMlKitEntityExtractionPlugin.m rename to packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.m index 7cc0e196..9ab8c0a4 100644 --- a/packages/google_mlkit_entity_extraction/ios/Classes/GoogleMlKitEntityExtractionPlugin.m +++ b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitEntityExtractionPlugin.h" +#import "./include/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.h" #import #import diff --git a/packages/google_mlkit_entity_extraction/ios/Classes/GoogleMlKitEntityExtractionPlugin.h b/packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/include/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.h similarity index 100% rename from packages/google_mlkit_entity_extraction/ios/Classes/GoogleMlKitEntityExtractionPlugin.h rename to packages/google_mlkit_entity_extraction/ios/google_mlkit_entity_extraction/Sources/google_mlkit_entity_extraction/include/google_mlkit_entity_extraction/GoogleMlKitEntityExtractionPlugin.h diff --git a/packages/google_mlkit_face_detection/ios/Assets/.gitkeep b/packages/google_mlkit_face_detection/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection.podspec b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection.podspec index 826b7c84..91c98da1 100644 --- a/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection.podspec +++ b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_face_detection/Sources/google_mlkit_face_detection/**/*.{h,m}' + s.public_header_files = 'google_mlkit_face_detection/Sources/google_mlkit_face_detection/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/FaceDetection', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Package.swift b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Package.swift new file mode 100644 index 00000000..b6e12536 --- /dev/null +++ b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_face_detection", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-face-detection", + targets: ["google_mlkit_face_detection"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_face_detection", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_face_detection", + publicHeadersPath: "include/google_mlkit_face_detection", + cSettings: [ + .headerSearchPath("include/google_mlkit_face_detection") + ] + ), + ] +) diff --git a/packages/google_mlkit_face_detection/ios/Classes/GoogleMlKitFaceDetectionPlugin.m b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Sources/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.m similarity index 99% rename from packages/google_mlkit_face_detection/ios/Classes/GoogleMlKitFaceDetectionPlugin.m rename to packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Sources/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.m index ceec85bb..5f2e48f2 100644 --- a/packages/google_mlkit_face_detection/ios/Classes/GoogleMlKitFaceDetectionPlugin.m +++ b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Sources/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitFaceDetectionPlugin.h" +#import "./include/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.h" #import #import diff --git a/packages/google_mlkit_face_detection/ios/Classes/GoogleMlKitFaceDetectionPlugin.h b/packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Sources/google_mlkit_face_detection/include/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.h similarity index 100% rename from packages/google_mlkit_face_detection/ios/Classes/GoogleMlKitFaceDetectionPlugin.h rename to packages/google_mlkit_face_detection/ios/google_mlkit_face_detection/Sources/google_mlkit_face_detection/include/google_mlkit_face_detection/GoogleMlKitFaceDetectionPlugin.h diff --git a/packages/google_mlkit_face_mesh_detection/ios/Assets/.gitkeep b/packages/google_mlkit_face_mesh_detection/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection.podspec b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection.podspec index 131727eb..64eba721 100644 --- a/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection.podspec +++ b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/**/*.{h,m}' + s.public_header_files = 'google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/include/**/*.h' s.dependency 'Flutter' # s.dependency 'GoogleMLKit/FaceMeshDetection', '~> 5.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Package.swift b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Package.swift new file mode 100644 index 00000000..c296bd4b --- /dev/null +++ b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_face_mesh_detection", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-face-mesh-detection", + targets: ["google_mlkit_face_mesh_detection"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_face_mesh_detection", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_face_mesh_detection", + publicHeadersPath: "include/google_mlkit_face_mesh_detection", + cSettings: [ + .headerSearchPath("include/google_mlkit_face_mesh_detection") + ] + ), + ] +) diff --git a/packages/google_mlkit_face_mesh_detection/ios/Classes/GoogleMlKitFaceMeshDetectionPlugin.m b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.m similarity index 94% rename from packages/google_mlkit_face_mesh_detection/ios/Classes/GoogleMlKitFaceMeshDetectionPlugin.m rename to packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.m index df513652..c4a17ef4 100644 --- a/packages/google_mlkit_face_mesh_detection/ios/Classes/GoogleMlKitFaceMeshDetectionPlugin.m +++ b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitFaceMeshDetectionPlugin.h" +#import "./include/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.h" #import #define channelName @"google_mlkit_face_mesh_detector" diff --git a/packages/google_mlkit_face_mesh_detection/ios/Classes/GoogleMlKitFaceMeshDetectionPlugin.h b/packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/include/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.h similarity index 100% rename from packages/google_mlkit_face_mesh_detection/ios/Classes/GoogleMlKitFaceMeshDetectionPlugin.h rename to packages/google_mlkit_face_mesh_detection/ios/google_mlkit_face_mesh_detection/Sources/google_mlkit_face_mesh_detection/include/google_mlkit_face_mesh_detection/GoogleMlKitFaceMeshDetectionPlugin.h diff --git a/packages/google_mlkit_genai_image_description/ios/Assets/.gitkeep b/packages/google_mlkit_genai_image_description/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description.podspec b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description.podspec index c1401a94..8643cc4d 100644 --- a/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description.podspec +++ b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Package.swift b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Package.swift new file mode 100644 index 00000000..172e8b5d --- /dev/null +++ b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_image_description", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-image-description", + targets: ["google_mlkit_genai_image_description"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_image_description", + dependencies: [], + path: "Sources/google_mlkit_genai_image_description", + publicHeadersPath: "include/google_mlkit_genai_image_description", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_image_description") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_image_description/ios/Classes/GoogleMlKitGenaiImageDescriptionPlugin.m b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.m similarity index 96% rename from packages/google_mlkit_genai_image_description/ios/Classes/GoogleMlKitGenaiImageDescriptionPlugin.m rename to packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.m index e8f55e62..e21b1aa3 100644 --- a/packages/google_mlkit_genai_image_description/ios/Classes/GoogleMlKitGenaiImageDescriptionPlugin.m +++ b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiImageDescriptionPlugin.h" +#import "./include/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.h" #define channelName @"google_mlkit_genai_image_description" #define checkFeatureStatus @"genai#checkFeatureStatus" diff --git a/packages/google_mlkit_genai_image_description/ios/Classes/GoogleMlKitGenaiImageDescriptionPlugin.h b/packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/include/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.h similarity index 100% rename from packages/google_mlkit_genai_image_description/ios/Classes/GoogleMlKitGenaiImageDescriptionPlugin.h rename to packages/google_mlkit_genai_image_description/ios/google_mlkit_genai_image_description/Sources/google_mlkit_genai_image_description/include/google_mlkit_genai_image_description/GoogleMlKitGenaiImageDescriptionPlugin.h diff --git a/packages/google_mlkit_genai_prompt/ios/Assets/.gitkeep b/packages/google_mlkit_genai_prompt/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt.podspec b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt.podspec index c1401a94..c7549078 100644 --- a/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt.podspec +++ b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Package.swift b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Package.swift new file mode 100644 index 00000000..fa3b06b2 --- /dev/null +++ b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_prompt", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-prompt", + targets: ["google_mlkit_genai_prompt"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_prompt", + dependencies: [], + path: "Sources/google_mlkit_genai_prompt", + publicHeadersPath: "include/google_mlkit_genai_prompt", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_prompt") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_prompt/ios/Classes/GoogleMlKitGenaiPromptPlugin.m b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.m similarity index 97% rename from packages/google_mlkit_genai_prompt/ios/Classes/GoogleMlKitGenaiPromptPlugin.m rename to packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.m index 836f06d1..a0aa6f92 100644 --- a/packages/google_mlkit_genai_prompt/ios/Classes/GoogleMlKitGenaiPromptPlugin.m +++ b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiPromptPlugin.h" +#import "./include/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.h" #define channelName @"google_mlkit_genai_prompt" #define checkFeatureStatus @"genai#checkFeatureStatus" diff --git a/packages/google_mlkit_genai_prompt/ios/Classes/GoogleMlKitGenaiPromptPlugin.h b/packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/include/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.h similarity index 100% rename from packages/google_mlkit_genai_prompt/ios/Classes/GoogleMlKitGenaiPromptPlugin.h rename to packages/google_mlkit_genai_prompt/ios/google_mlkit_genai_prompt/Sources/google_mlkit_genai_prompt/include/google_mlkit_genai_prompt/GoogleMlKitGenaiPromptPlugin.h diff --git a/packages/google_mlkit_genai_proofreading/ios/Assets/.gitkeep b/packages/google_mlkit_genai_proofreading/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading.podspec b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading.podspec index c1401a94..98e928b3 100644 --- a/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading.podspec +++ b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Package.swift b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Package.swift new file mode 100644 index 00000000..74fa220f --- /dev/null +++ b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_proofreading", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-proofreading", + targets: ["google_mlkit_genai_proofreading"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_proofreading", + dependencies: [], + path: "Sources/google_mlkit_genai_proofreading", + publicHeadersPath: "include/google_mlkit_genai_proofreading", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_proofreading") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_proofreading/ios/Classes/GoogleMlKitGenaiProofreadingPlugin.m b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.m similarity index 96% rename from packages/google_mlkit_genai_proofreading/ios/Classes/GoogleMlKitGenaiProofreadingPlugin.m rename to packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.m index 65dc95da..8a0228f0 100644 --- a/packages/google_mlkit_genai_proofreading/ios/Classes/GoogleMlKitGenaiProofreadingPlugin.m +++ b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiProofreadingPlugin.h" +#import "./include/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.h" #define channelName @"google_mlkit_genai_proofreading" #define checkFeatureStatus @"genai#checkFeatureStatus" diff --git a/packages/google_mlkit_genai_proofreading/ios/Classes/GoogleMlKitGenaiProofreadingPlugin.h b/packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/include/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.h similarity index 100% rename from packages/google_mlkit_genai_proofreading/ios/Classes/GoogleMlKitGenaiProofreadingPlugin.h rename to packages/google_mlkit_genai_proofreading/ios/google_mlkit_genai_proofreading/Sources/google_mlkit_genai_proofreading/include/google_mlkit_genai_proofreading/GoogleMlKitGenaiProofreadingPlugin.h diff --git a/packages/google_mlkit_genai_rewriting/ios/Assets/.gitkeep b/packages/google_mlkit_genai_rewriting/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting.podspec b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting.podspec index c1401a94..769f44c8 100644 --- a/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting.podspec +++ b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Package.swift b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Package.swift new file mode 100644 index 00000000..93f12611 --- /dev/null +++ b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_rewriting", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-rewriting", + targets: ["google_mlkit_genai_rewriting"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_rewriting", + dependencies: [], + path: "Sources/google_mlkit_genai_rewriting", + publicHeadersPath: "include/google_mlkit_genai_rewriting", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_rewriting") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_rewriting/ios/Classes/GoogleMlKitGenaiRewritingPlugin.m b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.m similarity index 96% rename from packages/google_mlkit_genai_rewriting/ios/Classes/GoogleMlKitGenaiRewritingPlugin.m rename to packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.m index 0a021bab..fb68533d 100644 --- a/packages/google_mlkit_genai_rewriting/ios/Classes/GoogleMlKitGenaiRewritingPlugin.m +++ b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiRewritingPlugin.h" +#import "./include/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.h" #define channelName @"google_mlkit_genai_rewriting" #define checkFeatureStatus @"genai#checkFeatureStatus" diff --git a/packages/google_mlkit_genai_rewriting/ios/Classes/GoogleMlKitGenaiRewritingPlugin.h b/packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/include/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.h similarity index 100% rename from packages/google_mlkit_genai_rewriting/ios/Classes/GoogleMlKitGenaiRewritingPlugin.h rename to packages/google_mlkit_genai_rewriting/ios/google_mlkit_genai_rewriting/Sources/google_mlkit_genai_rewriting/include/google_mlkit_genai_rewriting/GoogleMlKitGenaiRewritingPlugin.h diff --git a/packages/google_mlkit_genai_speech_recognition/ios/Assets/.gitkeep b/packages/google_mlkit_genai_speech_recognition/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition.podspec b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition.podspec index c1401a94..2597b931 100644 --- a/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition.podspec +++ b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Package.swift b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Package.swift new file mode 100644 index 00000000..4cd12c40 --- /dev/null +++ b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_speech_recognition", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-speech-recognition", + targets: ["google_mlkit_genai_speech_recognition"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_speech_recognition", + dependencies: [], + path: "Sources/google_mlkit_genai_speech_recognition", + publicHeadersPath: "include/google_mlkit_genai_speech_recognition", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_speech_recognition") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_speech_recognition/ios/Classes/GoogleMlKitGenaiSpeechRecognitionPlugin.m b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.m similarity index 95% rename from packages/google_mlkit_genai_speech_recognition/ios/Classes/GoogleMlKitGenaiSpeechRecognitionPlugin.m rename to packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.m index 0929b823..fbcd867f 100644 --- a/packages/google_mlkit_genai_speech_recognition/ios/Classes/GoogleMlKitGenaiSpeechRecognitionPlugin.m +++ b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiSpeechRecognitionPlugin.h" +#import "./include/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.h" #define channelName @"google_mlkit_genai_speech_recognition" #define checkStatus @"genai#checkStatus" diff --git a/packages/google_mlkit_genai_speech_recognition/ios/Classes/GoogleMlKitGenaiSpeechRecognitionPlugin.h b/packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/include/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.h similarity index 100% rename from packages/google_mlkit_genai_speech_recognition/ios/Classes/GoogleMlKitGenaiSpeechRecognitionPlugin.h rename to packages/google_mlkit_genai_speech_recognition/ios/google_mlkit_genai_speech_recognition/Sources/google_mlkit_genai_speech_recognition/include/google_mlkit_genai_speech_recognition/GoogleMlKitGenaiSpeechRecognitionPlugin.h diff --git a/packages/google_mlkit_genai_summarization/ios/Assets/.gitkeep b/packages/google_mlkit_genai_summarization/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization.podspec b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization.podspec index c1401a94..7b5f9062 100644 --- a/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization.podspec +++ b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/**/*.{h,m}' + s.public_header_files = 'google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '15.5' s.ios.deployment_target = '15.5' diff --git a/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Package.swift b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Package.swift new file mode 100644 index 00000000..526bfb32 --- /dev/null +++ b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_genai_summarization", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-genai-summarization", + targets: ["google_mlkit_genai_summarization"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_genai_summarization", + dependencies: [], + path: "Sources/google_mlkit_genai_summarization", + publicHeadersPath: "include/google_mlkit_genai_summarization", + cSettings: [ + .headerSearchPath("include/google_mlkit_genai_summarization") + ] + ), + ] +) diff --git a/packages/google_mlkit_genai_summarization/ios/Classes/GoogleMlKitGenaiSummarizationPlugin.m b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.m similarity index 96% rename from packages/google_mlkit_genai_summarization/ios/Classes/GoogleMlKitGenaiSummarizationPlugin.m rename to packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.m index 4511fb5d..6f7bbf39 100644 --- a/packages/google_mlkit_genai_summarization/ios/Classes/GoogleMlKitGenaiSummarizationPlugin.m +++ b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.m @@ -1,5 +1,5 @@ #import -#import "GoogleMlKitGenaiSummarizationPlugin.h" +#import "./include/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.h" #define channelName @"google_mlkit_genai_summarization" #define checkFeatureStatus @"genai#checkFeatureStatus" diff --git a/packages/google_mlkit_genai_summarization/ios/Classes/GoogleMlKitGenaiSummarizationPlugin.h b/packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/include/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.h similarity index 100% rename from packages/google_mlkit_genai_summarization/ios/Classes/GoogleMlKitGenaiSummarizationPlugin.h rename to packages/google_mlkit_genai_summarization/ios/google_mlkit_genai_summarization/Sources/google_mlkit_genai_summarization/include/google_mlkit_genai_summarization/GoogleMlKitGenaiSummarizationPlugin.h diff --git a/packages/google_mlkit_image_labeling/ios/Assets/.gitkeep b/packages/google_mlkit_image_labeling/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling.podspec b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling.podspec index 0a1f703c..493b1042 100644 --- a/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling.podspec +++ b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/**/*.{h,m}' + s.public_header_files = 'google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/ImageLabeling', '~> 9.0.0' s.dependency 'GoogleMLKit/ImageLabelingCustom', '~> 9.0.0' diff --git a/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Package.swift b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Package.swift new file mode 100644 index 00000000..0add7d97 --- /dev/null +++ b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_image_labeling", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-image-labeling", + targets: ["google_mlkit_image_labeling"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_image_labeling", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_image_labeling", + publicHeadersPath: "include/google_mlkit_image_labeling", + cSettings: [ + .headerSearchPath("include/google_mlkit_image_labeling") + ] + ), + ] +) diff --git a/packages/google_mlkit_image_labeling/ios/Classes/GoogleMlKitImageLabelingPlugin.m b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.m similarity index 98% rename from packages/google_mlkit_image_labeling/ios/Classes/GoogleMlKitImageLabelingPlugin.m rename to packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.m index 81e65c14..fb8bf716 100644 --- a/packages/google_mlkit_image_labeling/ios/Classes/GoogleMlKitImageLabelingPlugin.m +++ b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitImageLabelingPlugin.h" +#import "./include/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.h" #import #import #import diff --git a/packages/google_mlkit_image_labeling/ios/Classes/GoogleMlKitImageLabelingPlugin.h b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/include/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.h similarity index 100% rename from packages/google_mlkit_image_labeling/ios/Classes/GoogleMlKitImageLabelingPlugin.h rename to packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/include/google_mlkit_image_labeling/GoogleMlKitImageLabelingPlugin.h diff --git a/packages/google_mlkit_image_labeling/ios/Classes/MlKitEnums.h b/packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/include/google_mlkit_image_labeling/MlKitEnums.h similarity index 100% rename from packages/google_mlkit_image_labeling/ios/Classes/MlKitEnums.h rename to packages/google_mlkit_image_labeling/ios/google_mlkit_image_labeling/Sources/google_mlkit_image_labeling/include/google_mlkit_image_labeling/MlKitEnums.h diff --git a/packages/google_mlkit_language_id/ios/Assets/.gitkeep b/packages/google_mlkit_language_id/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_language_id/ios/google_mlkit_language_id.podspec b/packages/google_mlkit_language_id/ios/google_mlkit_language_id.podspec index 87a928ac..8c825861 100644 --- a/packages/google_mlkit_language_id/ios/google_mlkit_language_id.podspec +++ b/packages/google_mlkit_language_id/ios/google_mlkit_language_id.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_language_id/Sources/google_mlkit_language_id/**/*.{h,m}' + s.public_header_files = 'google_mlkit_language_id/Sources/google_mlkit_language_id/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/LanguageID', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Package.swift b/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Package.swift new file mode 100644 index 00000000..534278aa --- /dev/null +++ b/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_language_id", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-language-id", + targets: ["google_mlkit_language_id"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_language_id", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_language_id", + publicHeadersPath: "include/google_mlkit_language_id", + cSettings: [ + .headerSearchPath("include/google_mlkit_language_id") + ] + ), + ] +) diff --git a/packages/google_mlkit_language_id/ios/Classes/GoogleMlKitLanguageIdPlugin.m b/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Sources/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.m similarity index 98% rename from packages/google_mlkit_language_id/ios/Classes/GoogleMlKitLanguageIdPlugin.m rename to packages/google_mlkit_language_id/ios/google_mlkit_language_id/Sources/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.m index 057dd3de..af409996 100644 --- a/packages/google_mlkit_language_id/ios/Classes/GoogleMlKitLanguageIdPlugin.m +++ b/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Sources/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitLanguageIdPlugin.h" +#import "./include/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.h" #import #import diff --git a/packages/google_mlkit_language_id/ios/Classes/GoogleMlKitLanguageIdPlugin.h b/packages/google_mlkit_language_id/ios/google_mlkit_language_id/Sources/google_mlkit_language_id/include/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.h similarity index 100% rename from packages/google_mlkit_language_id/ios/Classes/GoogleMlKitLanguageIdPlugin.h rename to packages/google_mlkit_language_id/ios/google_mlkit_language_id/Sources/google_mlkit_language_id/include/google_mlkit_language_id/GoogleMlKitLanguageIdPlugin.h diff --git a/packages/google_mlkit_object_detection/ios/Assets/.gitkeep b/packages/google_mlkit_object_detection/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection.podspec b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection.podspec index 948fbf88..da70363f 100644 --- a/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection.podspec +++ b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_object_detection/Sources/google_mlkit_object_detection/**/*.{h,m}' + s.public_header_files = 'google_mlkit_object_detection/Sources/google_mlkit_object_detection/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/ObjectDetection', '~> 9.0.0' s.dependency 'GoogleMLKit/ObjectDetectionCustom', '~> 9.0.0' diff --git a/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Package.swift b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Package.swift new file mode 100644 index 00000000..fe758fb4 --- /dev/null +++ b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_object_detection", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-object-detection", + targets: ["google_mlkit_object_detection"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_object_detection", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_object_detection", + publicHeadersPath: "include/google_mlkit_object_detection", + cSettings: [ + .headerSearchPath("include/google_mlkit_object_detection") + ] + ), + ] +) diff --git a/packages/google_mlkit_object_detection/ios/Classes/GoogleMlKitObjectDetectionPlugin.m b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.m similarity index 99% rename from packages/google_mlkit_object_detection/ios/Classes/GoogleMlKitObjectDetectionPlugin.m rename to packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.m index e2e1b8d6..5d525460 100644 --- a/packages/google_mlkit_object_detection/ios/Classes/GoogleMlKitObjectDetectionPlugin.m +++ b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitObjectDetectionPlugin.h" +#import "./include/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.h" #import #import #import diff --git a/packages/google_mlkit_object_detection/ios/Classes/GoogleMlKitObjectDetectionPlugin.h b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/include/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.h similarity index 100% rename from packages/google_mlkit_object_detection/ios/Classes/GoogleMlKitObjectDetectionPlugin.h rename to packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/include/google_mlkit_object_detection/GoogleMlKitObjectDetectionPlugin.h diff --git a/packages/google_mlkit_object_detection/ios/Classes/MlKitEnums.h b/packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/include/google_mlkit_object_detection/MlKitEnums.h similarity index 100% rename from packages/google_mlkit_object_detection/ios/Classes/MlKitEnums.h rename to packages/google_mlkit_object_detection/ios/google_mlkit_object_detection/Sources/google_mlkit_object_detection/include/google_mlkit_object_detection/MlKitEnums.h diff --git a/packages/google_mlkit_pose_detection/ios/Assets/.gitkeep b/packages/google_mlkit_pose_detection/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection.podspec b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection.podspec index c0eda885..3c78110b 100644 --- a/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection.podspec +++ b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/**/*.{h,m}' + s.public_header_files = 'google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/PoseDetection', '~> 9.0.0' s.dependency 'GoogleMLKit/PoseDetectionAccurate', '~> 9.0.0' diff --git a/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Package.swift b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Package.swift new file mode 100644 index 00000000..e6c1cbd4 --- /dev/null +++ b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_pose_detection", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-pose-detection", + targets: ["google_mlkit_pose_detection"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_pose_detection", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_pose_detection", + publicHeadersPath: "include/google_mlkit_pose_detection", + cSettings: [ + .headerSearchPath("include/google_mlkit_pose_detection") + ] + ), + ] +) diff --git a/packages/google_mlkit_pose_detection/ios/Classes/GoogleMlKitPoseDetectionPlugin.m b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.m similarity index 98% rename from packages/google_mlkit_pose_detection/ios/Classes/GoogleMlKitPoseDetectionPlugin.m rename to packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.m index 2cfc6afa..9c23e55a 100644 --- a/packages/google_mlkit_pose_detection/ios/Classes/GoogleMlKitPoseDetectionPlugin.m +++ b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitPoseDetectionPlugin.h" +#import "./include/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.h" #import #import #import diff --git a/packages/google_mlkit_pose_detection/ios/Classes/GoogleMlKitPoseDetectionPlugin.h b/packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/include/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.h similarity index 100% rename from packages/google_mlkit_pose_detection/ios/Classes/GoogleMlKitPoseDetectionPlugin.h rename to packages/google_mlkit_pose_detection/ios/google_mlkit_pose_detection/Sources/google_mlkit_pose_detection/include/google_mlkit_pose_detection/GoogleMlKitPoseDetectionPlugin.h diff --git a/packages/google_mlkit_selfie_segmentation/ios/Assets/.gitkeep b/packages/google_mlkit_selfie_segmentation/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation.podspec b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation.podspec index 47e89760..11a5287a 100644 --- a/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation.podspec +++ b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/**/*.{h,m}' + s.public_header_files = 'google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/SegmentationSelfie', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Package.swift b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Package.swift new file mode 100644 index 00000000..0e44ad2b --- /dev/null +++ b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_selfie_segmentation", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-selfie-segmentation", + targets: ["google_mlkit_selfie_segmentation"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_selfie_segmentation", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_selfie_segmentation", + publicHeadersPath: "include/google_mlkit_selfie_segmentation", + cSettings: [ + .headerSearchPath("include/google_mlkit_selfie_segmentation") + ] + ), + ] +) diff --git a/packages/google_mlkit_selfie_segmentation/ios/Classes/GoogleMlKitSelfieSegmentationPlugin.m b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.m similarity index 97% rename from packages/google_mlkit_selfie_segmentation/ios/Classes/GoogleMlKitSelfieSegmentationPlugin.m rename to packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.m index 7cf51212..f345da5d 100644 --- a/packages/google_mlkit_selfie_segmentation/ios/Classes/GoogleMlKitSelfieSegmentationPlugin.m +++ b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitSelfieSegmentationPlugin.h" +#import "./include/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.h" #import #import #import diff --git a/packages/google_mlkit_selfie_segmentation/ios/Classes/GoogleMlKitSelfieSegmentationPlugin.h b/packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/include/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.h similarity index 100% rename from packages/google_mlkit_selfie_segmentation/ios/Classes/GoogleMlKitSelfieSegmentationPlugin.h rename to packages/google_mlkit_selfie_segmentation/ios/google_mlkit_selfie_segmentation/Sources/google_mlkit_selfie_segmentation/include/google_mlkit_selfie_segmentation/GoogleMlKitSelfieSegmentationPlugin.h diff --git a/packages/google_mlkit_smart_reply/ios/Assets/.gitkeep b/packages/google_mlkit_smart_reply/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply.podspec b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply.podspec index cb03f48d..ddc8b9c5 100644 --- a/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply.podspec +++ b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/**/*.{h,m}' + s.public_header_files = 'google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/SmartReply', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Package.swift b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Package.swift new file mode 100644 index 00000000..7d68c4aa --- /dev/null +++ b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_smart_reply", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-smart-reply", + targets: ["google_mlkit_smart_reply"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_smart_reply", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_smart_reply", + publicHeadersPath: "include/google_mlkit_smart_reply", + cSettings: [ + .headerSearchPath("include/google_mlkit_smart_reply") + ] + ), + ] +) diff --git a/packages/google_mlkit_smart_reply/ios/Classes/GoogleMlKitSmartReplyPlugin.m b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.m similarity index 97% rename from packages/google_mlkit_smart_reply/ios/Classes/GoogleMlKitSmartReplyPlugin.m rename to packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.m index 459ffcfe..82fc595b 100644 --- a/packages/google_mlkit_smart_reply/ios/Classes/GoogleMlKitSmartReplyPlugin.m +++ b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitSmartReplyPlugin.h" +#import "./include/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.h" #import #import diff --git a/packages/google_mlkit_smart_reply/ios/Classes/GoogleMlKitSmartReplyPlugin.h b/packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/include/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.h similarity index 100% rename from packages/google_mlkit_smart_reply/ios/Classes/GoogleMlKitSmartReplyPlugin.h rename to packages/google_mlkit_smart_reply/ios/google_mlkit_smart_reply/Sources/google_mlkit_smart_reply/include/google_mlkit_smart_reply/GoogleMlKitSmartReplyPlugin.h diff --git a/packages/google_mlkit_subject_segmentation/ios/Assets/.gitkeep b/packages/google_mlkit_subject_segmentation/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation.podspec b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation.podspec index 1abf19c2..57aa31f6 100644 --- a/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation.podspec +++ b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.author = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/**/*.{h,m}' + s.public_header_files = 'google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/include/**/*.h' s.dependency 'Flutter' # s.dependency 'GoogleMLKit/SubjectSegmentation', '~> 6.0.0' s.platform = :ios, '15.5' diff --git a/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Package.swift b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Package.swift new file mode 100644 index 00000000..8d803efb --- /dev/null +++ b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_subject_segmentation", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-subject-segmentation", + targets: ["google_mlkit_subject_segmentation"] + ), + ], + dependencies: [], + targets: [ + .target( + name: "google_mlkit_subject_segmentation", + dependencies: [], + path: "Sources/google_mlkit_subject_segmentation", + publicHeadersPath: "include/google_mlkit_subject_segmentation", + cSettings: [ + .headerSearchPath("include/google_mlkit_subject_segmentation") + ] + ), + ] +) diff --git a/packages/google_mlkit_subject_segmentation/ios/Classes/GoogleMlKitSubjectSegmentationPlugin.m b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.m similarity index 86% rename from packages/google_mlkit_subject_segmentation/ios/Classes/GoogleMlKitSubjectSegmentationPlugin.m rename to packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.m index 8c703c58..964447a4 100644 --- a/packages/google_mlkit_subject_segmentation/ios/Classes/GoogleMlKitSubjectSegmentationPlugin.m +++ b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitSubjectSegmentationPlugin.h" +#import "./include/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.h" @implementation GoogleMlKitSubjectSegmentationPlugin + (void)registerWithRegistrar:(NSObject*)registrar { diff --git a/packages/google_mlkit_subject_segmentation/ios/Classes/GoogleMlKitSubjectSegmentationPlugin.h b/packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/include/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.h similarity index 100% rename from packages/google_mlkit_subject_segmentation/ios/Classes/GoogleMlKitSubjectSegmentationPlugin.h rename to packages/google_mlkit_subject_segmentation/ios/google_mlkit_subject_segmentation/Sources/google_mlkit_subject_segmentation/include/google_mlkit_subject_segmentation/GoogleMlKitSubjectSegmentationPlugin.h diff --git a/packages/google_mlkit_text_recognition/ios/Assets/.gitkeep b/packages/google_mlkit_text_recognition/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition.podspec b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition.podspec index 0bbfe386..f40bec26 100644 --- a/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition.podspec +++ b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/**/*.{h,m}' + s.public_header_files = 'google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/TextRecognition', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Package.swift b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Package.swift new file mode 100644 index 00000000..5cc9ceed --- /dev/null +++ b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_text_recognition", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-text-recognition", + targets: ["google_mlkit_text_recognition"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_text_recognition", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_text_recognition", + publicHeadersPath: "include/google_mlkit_text_recognition", + cSettings: [ + .headerSearchPath("include/google_mlkit_text_recognition") + ] + ), + ] +) diff --git a/packages/google_mlkit_text_recognition/ios/Classes/GoogleMlKitTextRecognitionPlugin.m b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.m similarity index 99% rename from packages/google_mlkit_text_recognition/ios/Classes/GoogleMlKitTextRecognitionPlugin.m rename to packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.m index b388ff3a..9aa2b87c 100644 --- a/packages/google_mlkit_text_recognition/ios/Classes/GoogleMlKitTextRecognitionPlugin.m +++ b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitTextRecognitionPlugin.h" +#import "./include/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.h" #import #import #if __has_include() diff --git a/packages/google_mlkit_text_recognition/ios/Classes/GoogleMlKitTextRecognitionPlugin.h b/packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/include/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.h similarity index 100% rename from packages/google_mlkit_text_recognition/ios/Classes/GoogleMlKitTextRecognitionPlugin.h rename to packages/google_mlkit_text_recognition/ios/google_mlkit_text_recognition/Sources/google_mlkit_text_recognition/include/google_mlkit_text_recognition/GoogleMlKitTextRecognitionPlugin.h diff --git a/packages/google_mlkit_translation/ios/Assets/.gitkeep b/packages/google_mlkit_translation/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/google_mlkit_translation/ios/google_mlkit_translation.podspec b/packages/google_mlkit_translation/ios/google_mlkit_translation.podspec index 9783c557..d9f3c038 100644 --- a/packages/google_mlkit_translation/ios/google_mlkit_translation.podspec +++ b/packages/google_mlkit_translation/ios/google_mlkit_translation.podspec @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.authors = 'Multiple Authors' s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'google_mlkit_translation/Sources/google_mlkit_translation/**/*.{h,m}' + s.public_header_files = 'google_mlkit_translation/Sources/google_mlkit_translation/include/**/*.h' s.dependency 'Flutter' s.dependency 'GoogleMLKit/Translate', '~> 9.0.0' s.dependency 'google_mlkit_commons' diff --git a/packages/google_mlkit_translation/ios/google_mlkit_translation/Package.swift b/packages/google_mlkit_translation/ios/google_mlkit_translation/Package.swift new file mode 100644 index 00000000..ff714a8a --- /dev/null +++ b/packages/google_mlkit_translation/ios/google_mlkit_translation/Package.swift @@ -0,0 +1,31 @@ +// swift-tools-version:5.9 +import PackageDescription + +let package = Package( + name: "google_mlkit_translation", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "google-mlkit-translation", + targets: ["google_mlkit_translation"] + ), + ], + dependencies: [ + .package(path: "../../../google_mlkit_commons/ios/google_mlkit_commons"), + ], + targets: [ + .target( + name: "google_mlkit_translation", + dependencies: [ + .product(name: "google-mlkit-commons", package: "google_mlkit_commons"), + ], + path: "Sources/google_mlkit_translation", + publicHeadersPath: "include/google_mlkit_translation", + cSettings: [ + .headerSearchPath("include/google_mlkit_translation") + ] + ), + ] +) diff --git a/packages/google_mlkit_translation/ios/Classes/GoogleMlKitTranslationPlugin.m b/packages/google_mlkit_translation/ios/google_mlkit_translation/Sources/google_mlkit_translation/GoogleMlKitTranslationPlugin.m similarity index 97% rename from packages/google_mlkit_translation/ios/Classes/GoogleMlKitTranslationPlugin.m rename to packages/google_mlkit_translation/ios/google_mlkit_translation/Sources/google_mlkit_translation/GoogleMlKitTranslationPlugin.m index 3136b306..81abb3fb 100644 --- a/packages/google_mlkit_translation/ios/Classes/GoogleMlKitTranslationPlugin.m +++ b/packages/google_mlkit_translation/ios/google_mlkit_translation/Sources/google_mlkit_translation/GoogleMlKitTranslationPlugin.m @@ -1,4 +1,4 @@ -#import "GoogleMlKitTranslationPlugin.h" +#import "./include/google_mlkit_translation/GoogleMlKitTranslationPlugin.h" #import #import diff --git a/packages/google_mlkit_translation/ios/Classes/GoogleMlKitTranslationPlugin.h b/packages/google_mlkit_translation/ios/google_mlkit_translation/Sources/google_mlkit_translation/include/google_mlkit_translation/GoogleMlKitTranslationPlugin.h similarity index 100% rename from packages/google_mlkit_translation/ios/Classes/GoogleMlKitTranslationPlugin.h rename to packages/google_mlkit_translation/ios/google_mlkit_translation/Sources/google_mlkit_translation/include/google_mlkit_translation/GoogleMlKitTranslationPlugin.h