Skip to content

Reverts "[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios (#6617)" #6693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2024
Merged

Reverts "[image_picker_ios] Adds Swift Package Manager compatibility to image_picker_ios (#6617)" #6693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/image_picker/image_picker_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
## 0.8.11

* Adds Swift Package Manager compatibility.

## 0.8.10+1

* Fixes a possible crash when calling a picker method UIGraphicsImageRenderer if imageToScale is nil.
Expand Down
2 changes: 2 additions & 0 deletions packages/image_picker/image_picker_ios/example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ target 'Runner' do
target 'RunnerTests' do
platform :ios, '12.0'
inherit! :search_paths
# Pods for testing
pod 'OCMock', '~> 3.8.1'
end
end

Expand Down
29 changes: 1 addition & 28 deletions packages/image_picker/image_picker_ios/example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
7865C5FD294157BC0010E17F /* icnsImage.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FB294157BB0010E17F /* icnsImage.icns */; };
7865C5FF294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
7865C600294252A60010E17F /* proRawImage.dng in Resources */ = {isa = PBXBuildFile; fileRef = 7865C5FE294252A60010E17F /* proRawImage.dng */; };
78CF8D862BC5E7070051231B /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 78CF8D852BC5E7070051231B /* OCMock */; };
86430DF9272D71E9002D9D6C /* gifImage.gif in Resources */ = {isa = PBXBuildFile; fileRef = 9FC8F0E8229FA49E00C8D58F /* gifImage.gif */; };
86E9A893272754860017E6E0 /* PickerSaveImageToPathOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 86E9A892272754860017E6E0 /* PickerSaveImageToPathOperationTests.m */; };
86E9A894272754A30017E6E0 /* webpImage.webp in Resources */ = {isa = PBXBuildFile; fileRef = 86E9A88F272747B90017E6E0 /* webpImage.webp */; };
Expand Down Expand Up @@ -130,7 +129,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78CF8D862BC5E7070051231B /* OCMock in Frameworks */,
3A72BAD3FAE6E0FA9D80826B /* libPods-RunnerTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -293,9 +291,6 @@
334733F82668136400DCC49E /* PBXTargetDependency */,
);
name = RunnerTests;
packageProductDependencies = (
78CF8D852BC5E7070051231B /* OCMock */,
);
productName = RunnerTests;
productReference = 334733F22668136400DCC49E /* RunnerTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand Down Expand Up @@ -347,7 +342,7 @@
isa = PBXProject;
attributes = {
DefaultBuildSystemTypeForWorkspace = Original;
LastUpgradeCheck = 1510;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "The Flutter Authors";
TargetAttributes = {
334733F12668136400DCC49E = {
Expand Down Expand Up @@ -379,9 +374,6 @@
Base,
);
mainGroup = 97C146E51CF9000F007C117D;
packageReferences = (
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */,
);
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -887,25 +879,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/erikdoe/ocmock";
requirement = {
kind = revision;
revision = ef21a2ece3ee092f8ed175417718bdd9b8eb7c9a;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
78CF8D852BC5E7070051231B /* OCMock */ = {
isa = XCSwiftPackageProductDependency;
package = 78CF8D842BC5E7070051231B /* XCRemoteSwiftPackageReference "ocmock" */;
productName = OCMock;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
13 changes: 0 additions & 13 deletions ...os/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...ker/image_picker_ios/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

Empty file added packages/image_picker/image_picker_ios/ios/Assets/.gitkeep
View file
Open in desktop
Empty file.
0 ...mage_picker_ios/FLTImagePickerImageUtil.h → ...ios/ios/Classes/FLTImagePickerImageUtil.h
View file
Open in desktop
File renamed without changes.
0 ...mage_picker_ios/FLTImagePickerImageUtil.m → ...ios/ios/Classes/FLTImagePickerImageUtil.m
View file
Open in desktop
File renamed without changes.
0 ...e_picker_ios/FLTImagePickerMetaDataUtil.h → .../ios/Classes/FLTImagePickerMetaDataUtil.h
View file
Open in desktop
File renamed without changes.
0 ...e_picker_ios/FLTImagePickerMetaDataUtil.m → .../ios/Classes/FLTImagePickerMetaDataUtil.m
View file
Open in desktop
File renamed without changes.
0 ...picker_ios/FLTImagePickerPhotoAssetUtil.h → ...os/Classes/FLTImagePickerPhotoAssetUtil.h
View file
Open in desktop
File renamed without changes.
0 ...picker_ios/FLTImagePickerPhotoAssetUtil.m → ...os/Classes/FLTImagePickerPhotoAssetUtil.m
View file
Open in desktop
File renamed without changes.
0 ...e/image_picker_ios/FLTImagePickerPlugin.h → ...er_ios/ios/Classes/FLTImagePickerPlugin.h
View file
Open in desktop
File renamed without changes.
0 ...s/image_picker_ios/FLTImagePickerPlugin.m → ...er_ios/ios/Classes/FLTImagePickerPlugin.m
View file
Open in desktop
File renamed without changes.
0 ...ge_picker_ios/FLTImagePickerPlugin_Test.h → ...s/ios/Classes/FLTImagePickerPlugin_Test.h
View file
Open in desktop
File renamed without changes.
0 ...ios/FLTPHPickerSaveImageToPathOperation.h → ...ses/FLTPHPickerSaveImageToPathOperation.h
View file
Open in desktop
File renamed without changes.
0 ...ios/FLTPHPickerSaveImageToPathOperation.m → ...ses/FLTPHPickerSaveImageToPathOperation.m
View file
Open in desktop
File renamed without changes.
0 ...r_ios/include/ImagePickerPlugin.modulemap → ...s/ios/Classes/ImagePickerPlugin.modulemap
View file
Open in desktop
File renamed without changes.
0 ...r_ios/include/image_picker_ios-umbrella.h → ...s/ios/Classes/image_picker_ios-umbrella.h
View file
Open in desktop
File renamed without changes.
0 ...ios/Sources/image_picker_ios/messages.g.h → ...image_picker_ios/ios/Classes/messages.g.h
View file
Open in desktop
File renamed without changes.
0 ...ios/Sources/image_picker_ios/messages.g.m → ...image_picker_ios/ios/Classes/messages.g.m
View file
Open in desktop
File renamed without changes.
0 ...icker_ios/Resources/PrivacyInfo.xcprivacy → ...r_ios/ios/Resources/PrivacyInfo.xcprivacy
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions packages/image_picker/image_picker_ios/ios/image_picker_ios.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Downloaded by pub (not CocoaPods).
s.author = { 'Flutter Dev Team' => '[email protected]' }
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/image_picker_ios' }
s.documentation_url = 'https://pub.dev/packages/image_picker_ios'
s.source_files = 'image_picker_ios/Sources/image_picker_ios/**/*.{h,m}'
s.public_header_files = 'image_picker_ios/Sources/image_picker_ios/**/*.h'
s.module_map = 'image_picker_ios/Sources/image_picker_ios/include/ImagePickerPlugin.modulemap'
s.source_files = 'Classes/**/*.{h,m}'
s.public_header_files = 'Classes/**/*.h'
s.module_map = 'Classes/ImagePickerPlugin.modulemap'
s.dependency 'Flutter'
s.platform = :ios, '12.0'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.resource_bundles = {'image_picker_ios_privacy' => ['image_picker_ios/Sources/image_picker_ios/Resources/PrivacyInfo.xcprivacy']}
s.resource_bundles = {'image_picker_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
end
31 changes: 0 additions & 31 deletions packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...r/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packages/image_picker/image_picker_ios/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ 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',
objcSourceOut: 'ios/image_picker_ios/Sources/image_picker_ios/messages.g.m',
objcHeaderOut: 'ios/Classes/messages.g.h',
objcSourceOut: 'ios/Classes/messages.g.m',
objcOptions: ObjcOptions(
prefix: 'FLT',
),
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10+1

environment:
sdk: ^3.3.0
Expand Down