Skip to content

Commit a9f14bc

Browse files
Reverts "[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios (flutter#6617)" (flutter#6693)
Reverts: flutter/packages#6617 Initiated by: vashworth Reason for reverting: Failing [Mac_arm64 ios_platform_tests_shard_1 master](https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_arm64%20ios_platform_tests_shard_1%20master/1942/overview) Original PR Author: vashworth Reviewed By: {loic-sharma, stuartmorgan} This change reverts the following previous change: Makes `image_picker_ios` available as a Swift Package to Flutter. Also, remains compatible with CocoaPods. Fixes flutter#146919.
1 parent a444af5 commit a9f14bc

27 files changed

+10
-110
lines changed

packages/image_picker/image_picker_ios/CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
## 0.8.11
2-
3-
* Adds Swift Package Manager compatibility.
4-
51
## 0.8.10+1
62

73
* Fixes a possible crash when calling a picker method UIGraphicsImageRenderer if imageToScale is nil.

packages/image_picker/image_picker_ios/example/ios/Podfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ target 'Runner' do
3333
target 'RunnerTests' do
3434
platform :ios, '12.0'
3535
inherit! :search_paths
36+
# Pods for testing
37+
pod 'OCMock', '~> 3.8.1'
3638
end
3739
end
3840

packages/image_picker/image_picker_ios/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
7865C5FD294157BC0010E17F /* icnsImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FB294157BB0010E17F /* icnsImage.icns */; };
3333
7865C5FF294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
3434
7865C600294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
35-
78CF8D862BC5E7070051231B /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 78CF8D852BC5E7070051231B /* OCMock */; };
3635
86430DF9272D71E9002D9D6C /* gifImage.gif in Resources */ = {isa = PBXBuildFile; fileRef = 9FC8F0E8229FA49E00C8D58F /* gifImage.gif */; };
3736
86E9A893272754860017E6E0 /* PickerSaveImageToPathOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 86E9A892272754860017E6E0 /* PickerSaveImageToPathOperationTests.m */; };
3837
86E9A894272754A30017E6E0 /* webpImage.webp in Resources */ = {isa = PBXBuildFile; fileRef = 86E9A88F272747B90017E6E0 /* webpImage.webp */; };
@@ -130,7 +129,6 @@
130129
isa = PBXFrameworksBuildPhase;
131130
buildActionMask = 2147483647;
132131
files = (
133-
78CF8D862BC5E7070051231B /* OCMock in Frameworks */,
134132
3A72BAD3FAE6E0FA9D80826B /* libPods-RunnerTests.a in Frameworks */,
135133
);
136134
runOnlyForDeploymentPostprocessing = 0;
@@ -293,9 +291,6 @@
293291
334733F82668136400DCC49E /* PBXTargetDependency */,
294292
);
295293
name = RunnerTests;
296-
packageProductDependencies = (
297-
78CF8D852BC5E7070051231B /* OCMock */,
298-
);
299294
productName = RunnerTests;
300295
productReference = 334733F22668136400DCC49E /* RunnerTests.xctest */;
301296
productType = "com.apple.product-type.bundle.unit-test";
@@ -347,7 +342,7 @@
347342
isa = PBXProject;
348343
attributes = {
349344
DefaultBuildSystemTypeForWorkspace = Original;
350-
LastUpgradeCheck = 1510;
345+
LastUpgradeCheck = 1430;
351346
ORGANIZATIONNAME = "The Flutter Authors";
352347
TargetAttributes = {
353348
334733F12668136400DCC49E = {
@@ -379,9 +374,6 @@
379374
Base,
380375
);
381376
mainGroup = 97C146E51CF9000F007C117D;
382-
packageReferences = (
383-
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */,
384-
);
385377
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
386378
projectDirPath = "";
387379
projectRoot = "";
@@ -887,25 +879,6 @@
887879
defaultConfigurationName = Release;
888880
};
889881
/* End XCConfigurationList section */
890-
891-
/* Begin XCRemoteSwiftPackageReference section */
892-
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */ = {
893-
isa = XCRemoteSwiftPackageReference;
894-
repositoryURL = "https://github.com/erikdoe/ocmock";
895-
requirement = {
896-
kind = revision;
897-
revision = ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a;
898-
};
899-
};
900-
/* End XCRemoteSwiftPackageReference section */
901-
902-
/* Begin XCSwiftPackageProductDependency section */
903-
78CF8D852BC5E7070051231B /* OCMock */ = {
904-
isa = XCSwiftPackageProductDependency;
905-
package = 78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */;
906-
productName = OCMock;
907-
};
908-
/* End XCSwiftPackageProductDependency section */
909882
};
910883
rootObject = 97C146E61CF9000F007C117D /* Project object */;
911884
}

packages/image_picker/image_picker_ios/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/image_picker/image_picker_ios/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/image_picker/image_picker_ios/ios/Assets/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)