[image_picker_ios] Make all headers public for SwiftPM to keep inline…

… with CocoaPods (#6707) To keep the SwiftPM implementation more inline with CocoaPods, make all headers public.
flutter · May 13, 2024 · ee8ee2e · ee8ee2e
1 parent d891fb9
commit ee8ee2e
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 9 deletions.
diff --git a/packages/image_picker/image_picker_ios/CHANGELOG.md b/packages/image_picker/image_picker_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.11+1
+
+* Makes all headers public with Swift Package Manager integration to keep inline with CocoaPods.
+
 ## 0.8.11
 
 * Adds Swift Package Manager compatibility.

diff --git a/...ker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/FLTImagePickerPlugin.m b/...ker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/FLTImagePickerPlugin.m
@@ -12,11 +12,11 @@
 #import <PhotosUI/PhotosUI.h>
 #import <UIKit/UIKit.h>
 
+#import "./include/image_picker_ios/messages.g.h"
 #import "FLTImagePickerImageUtil.h"
 #import "FLTImagePickerMetaDataUtil.h"
 #import "FLTImagePickerPhotoAssetUtil.h"
 #import "FLTPHPickerSaveImageToPathOperation.h"
-#import "messages.g.h"
 
 @implementation FLTImagePickerMethodCallContext
 - (instancetype)initWithResult:(nonnull FlutterResultAdapter)result {

diff --git a/...mage_picker_ios/FLTImagePickerImageUtil.h → ...mage_picker_ios/FLTImagePickerImageUtil.h b/...mage_picker_ios/FLTImagePickerImageUtil.h → ...mage_picker_ios/FLTImagePickerImageUtil.h
diff --git a/...e_picker_ios/FLTImagePickerMetaDataUtil.h → ...e_picker_ios/FLTImagePickerMetaDataUtil.h b/...e_picker_ios/FLTImagePickerMetaDataUtil.h → ...e_picker_ios/FLTImagePickerMetaDataUtil.h
diff --git a/...picker_ios/FLTImagePickerPhotoAssetUtil.h → ...picker_ios/FLTImagePickerPhotoAssetUtil.h b/...picker_ios/FLTImagePickerPhotoAssetUtil.h → ...picker_ios/FLTImagePickerPhotoAssetUtil.h
diff --git a/...ge_picker_ios/FLTImagePickerPlugin_Test.h → ...ge_picker_ios/FLTImagePickerPlugin_Test.h b/...ge_picker_ios/FLTImagePickerPlugin_Test.h → ...ge_picker_ios/FLTImagePickerPlugin_Test.h
diff --git a/...ios/FLTPHPickerSaveImageToPathOperation.h → ...ios/FLTPHPickerSaveImageToPathOperation.h b/...ios/FLTPHPickerSaveImageToPathOperation.h → ...ios/FLTPHPickerSaveImageToPathOperation.h
diff --git a/...ios/Sources/image_picker_ios/messages.g.h → ...ios/include/image_picker_ios/messages.g.h b/...ios/Sources/image_picker_ios/messages.g.h → ...ios/include/image_picker_ios/messages.g.h
diff --git a/...r/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap b/...r/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap
@@ -5,10 +5,10 @@ module image_picker_ios {
   module * { export * }
 
   explicit module Test {
-    header "../FLTImagePickerPlugin_Test.h"
-    header "../FLTImagePickerImageUtil.h"
-    header "../FLTImagePickerMetaDataUtil.h"
-    header "../FLTImagePickerPhotoAssetUtil.h"
-    header "../FLTPHPickerSaveImageToPathOperation.h"
+    header "image_picker_ios/FLTImagePickerPlugin_Test.h"
+    header "image_picker_ios/FLTImagePickerImageUtil.h"
+    header "image_picker_ios/FLTImagePickerMetaDataUtil.h"
+    header "image_picker_ios/FLTImagePickerPhotoAssetUtil.h"
+    header "image_picker_ios/FLTPHPickerSaveImageToPathOperation.h"
   }
 }
diff --git a/.../image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/messages.g.m b/.../image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/messages.g.m
@@ -4,7 +4,7 @@
 // Autogenerated from Pigeon (v17.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
-#import "messages.g.h"
+#import "./include/image_picker_ios/messages.g.h"
 
 #if TARGET_OS_OSX
 #import <FlutterMacOS/FlutterMacOS.h>

diff --git a/packages/image_picker/image_picker_ios/pigeons/messages.dart b/packages/image_picker/image_picker_ios/pigeons/messages.dart
@@ -7,10 +7,12 @@ import 'package:pigeon/pigeon.dart';
 @ConfigurePigeon(PigeonOptions(
   dartOut: 'lib/src/messages.g.dart',
   dartTestOut: 'test/test_api.g.dart',
-  objcHeaderOut: 'ios/image_picker_ios/Sources/image_picker_ios/messages.g.h',
+  objcHeaderOut:
+      'ios/image_picker_ios/Sources/image_picker_ios/include/image_picker_ios/messages.g.h',
   objcSourceOut: 'ios/image_picker_ios/Sources/image_picker_ios/messages.g.m',
   objcOptions: ObjcOptions(
     prefix: 'FLT',
+    headerIncludePath: './include/image_picker_ios/messages.g.h',
   ),
   copyrightHeader: 'pigeons/copyright.txt',
 ))

diff --git a/packages/image_picker/image_picker_ios/pubspec.yaml b/packages/image_picker/image_picker_ios/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker_ios
 description: iOS implementation of the image_picker plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.11
+version: 0.8.11+1
 
 environment:
   sdk: ^3.3.0