Skip to content

Commit 6872c3b

Browse files
authored
[image_picker_ios] Re-adds Swift Package Manager compatibility (flutter#6833)
Adds Swift Package Manager compatibility to `image_picker_ios`. The previous attempt, flutter/packages#6617, was partially reverted due to flutter#148307. This reland uses the new approach proposed in 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#146919.
1 parent d8e8e8c commit 6872c3b

File tree

8 files changed

+46
-1
lines changed

8 files changed

+46
-1
lines changed

packages/image_picker/image_picker_ios/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.12
2+
3+
* Re-adds Swift Package Manager compatibility.
4+
15
## 0.8.11+2
26

37
* Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#import "ImagePickerTestImages.h"
66

77
@import image_picker_ios;
8+
#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
89
@import image_picker_ios.Test;
10+
#endif
911
@import UniformTypeIdentifiers;
1012
@import XCTest;
1113

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#import "ImagePickerTestImages.h"
66

77
@import image_picker_ios;
8+
#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
89
@import image_picker_ios.Test;
10+
#endif
911
@import XCTest;
1012

1113
// 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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#import "ImagePickerTestImages.h"
66

77
@import image_picker_ios;
8+
#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
89
@import image_picker_ios.Test;
10+
#endif
911
@import XCTest;
1012

1113
@interface MetaDataUtilTests : XCTestCase

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#import "ImagePickerTestImages.h"
66

77
@import image_picker_ios;
8+
#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
89
@import image_picker_ios.Test;
10+
#endif
911
@import XCTest;
1012

1113
@interface PhotoAssetUtilTests : XCTestCase

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
#import <OCMock/OCMock.h>
66

77
@import image_picker_ios;
8+
#if __has_include(<image_picker_ios/image_picker_ios-umbrella.h>)
89
@import image_picker_ios.Test;
10+
#endif
911
@import UniformTypeIdentifiers;
1012
@import XCTest;
1113

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// swift-tools-version: 5.9
2+
3+
// Copyright 2013 The Flutter Authors. All rights reserved.
4+
// Use of this source code is governed by a BSD-style license that can be
5+
// found in the LICENSE file.
6+
7+
import PackageDescription
8+
9+
let package = Package(
10+
name: "image_picker_ios",
11+
platforms: [
12+
.iOS("12.0")
13+
],
14+
products: [
15+
.library(name: "image-picker-ios", targets: ["image_picker_ios"])
16+
],
17+
dependencies: [],
18+
targets: [
19+
.target(
20+
name: "image_picker_ios",
21+
dependencies: [],
22+
exclude: ["include/image_picker_ios-umbrella.h", "include/ImagePickerPlugin.modulemap"],
23+
resources: [
24+
.process("Resources")
25+
],
26+
cSettings: [
27+
.headerSearchPath("include/image_picker_ios")
28+
]
29+
)
30+
]
31+
)

packages/image_picker/image_picker_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: image_picker_ios
22
description: iOS implementation of the image_picker plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
5-
version: 0.8.11+2
5+
version: 0.8.12
66

77
environment:
88
sdk: ^3.3.0

0 commit comments

Comments
 (0)