[image_picker_ios] Re-adds Swift Package Manager compatibility (flutt…

…er#6833)

Adds Swift Package Manager compatibility to `image_picker_ios`.

The previous attempt, flutter#6617, was partially reverted due to flutter/flutter#148307. This reland uses the new approach proposed in flutter/flutter#148572: the Swift Package Manager package does not have a `.modulemap`. As a result, the plugin no longer has a `.Test` submodule if using Swift Package Manager.

Fixes flutter/flutter#146919.

packages/image_picker/image_picker_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.12
+
+* Re-adds Swift Package Manager compatibility.
+
 ## 0.8.11+2
 
 * Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds.

packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImagePickerPluginTests.m

@@ -5,7 +5,9 @@
 #import "ImagePickerTestImages.h"
 
 @import image_picker_ios;
+#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
 @import image_picker_ios.Test;
+#endif
 @import UniformTypeIdentifiers;
 @import XCTest;
 

packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImageUtilTests.m

@@ -5,7 +5,9 @@
 #import "ImagePickerTestImages.h"
 
 @import image_picker_ios;
+#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
 @import image_picker_ios.Test;
+#endif
 @import XCTest;
 
 // Corner colors of test image scaled to 3x2. Format is "R G B A".

packages/image_picker/image_picker_ios/example/ios/RunnerTests/MetaDataUtilTests.m

@@ -5,7 +5,9 @@
 #import "ImagePickerTestImages.h"
 
 @import image_picker_ios;
+#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
 @import image_picker_ios.Test;
+#endif
 @import XCTest;
 
 @interface MetaDataUtilTests : XCTestCase

packages/image_picker/image_picker_ios/example/ios/RunnerTests/PhotoAssetUtilTests.m

@@ -5,7 +5,9 @@
 #import "ImagePickerTestImages.h"
 
 @import image_picker_ios;
+#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
 @import image_picker_ios.Test;
+#endif
 @import XCTest;
 
 @interface PhotoAssetUtilTests : XCTestCase

packages/image_picker/image_picker_ios/example/ios/RunnerTests/PickerSaveImageToPathOperationTests.m

@@ -5,7 +5,9 @@
 #import <OCMock/OCMock.h>
 
 @import image_picker_ios;
+#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
 @import image_picker_ios.Test;
+#endif
 @import UniformTypeIdentifiers;
 @import XCTest;
 

packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift

@@ -0,0 +1,31 @@
+// swift-tools-version: 5.9
+
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import PackageDescription
+
+let package = Package(
+  name: "image_picker_ios",
+  platforms: [
+    .iOS("12.0")
+  ],
+  products: [
+    .library(name: "image-picker-ios", targets: ["image_picker_ios"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "image_picker_ios",
+      dependencies: [],
+      exclude: ["include/image_picker_ios-umbrella.h", "include/ImagePickerPlugin.modulemap"],
+      resources: [
+        .process("Resources")
+      ],
+      cSettings: [
+        .headerSearchPath("include/image_picker_ios")
+      ]
+    )
+  ]
+)

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+2
+version: 0.8.12
 
 environment:
   sdk: ^3.3.0