Skip to content

Commit 6ab5089

Browse files
jmagmanmormih
jmagman
authored and
mormih
committed
[image_picker] Update and migrate iOS example project (flutter#2095)
1 parent 8eaeae9 commit 6ab5089

File tree

4 files changed

+36
-31
lines changed

4 files changed

+36
-31
lines changed

‎packages/image_picker/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.1+5
2+
3+
* Update and migrate iOS example project.
4+
15
## 0.6.1+4
26

37
* Android: Fix a regression where the `retrieveLostImage` does not work anymore.

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

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
68F4B464228B3AB500C25614 /* PhotoAssetUtilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68F4B463228B3AB500C25614 /* PhotoAssetUtilTests.m */; };
1919
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
2020
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
21-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
22-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
2321
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2422
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2523
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -253,12 +251,11 @@
253251
isa = PBXProject;
254252
attributes = {
255253
DefaultBuildSystemTypeForWorkspace = Original;
256-
LastUpgradeCheck = 0830;
254+
LastUpgradeCheck = 1100;
257255
ORGANIZATIONNAME = "The Chromium Authors";
258256
TargetAttributes = {
259257
680049162280D368006DD6AB = {
260258
CreatedOnToolsVersion = 10.2.1;
261-
DevelopmentTeam = S8QB4VV633;
262259
ProvisioningStyle = Automatic;
263260
TestTargetID = 97C146ED1CF9000F007C117D;
264261
};
@@ -274,10 +271,9 @@
274271
};
275272
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
276273
compatibilityVersion = "Xcode 3.2";
277-
developmentRegion = English;
274+
developmentRegion = en;
278275
hasScannedForEncodings = 0;
279276
knownRegions = (
280-
English,
281277
en,
282278
Base,
283279
);
@@ -310,9 +306,7 @@
310306
files = (
311307
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
312308
9FC8F0E9229FA49E00C8D58F /* gifImage.gif in Resources */,
313-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
314309
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
315-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
316310
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
317311
);
318312
runOnlyForDeploymentPostprocessing = 0;
@@ -340,16 +334,13 @@
340334
files = (
341335
);
342336
inputPaths = (
343-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
344-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
345337
);
346338
name = "[CP] Embed Pods Frameworks";
347339
outputPaths = (
348-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
349340
);
350341
runOnlyForDeploymentPostprocessing = 0;
351342
shellPath = /bin/sh;
352-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
343+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
353344
showEnvVarsInLog = 0;
354345
};
355346
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -456,7 +447,6 @@
456447
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
457448
CODE_SIGN_IDENTITY = "iPhone Developer";
458449
CODE_SIGN_STYLE = Automatic;
459-
DEVELOPMENT_TEAM = S8QB4VV633;
460450
GCC_C_LANGUAGE_STANDARD = gnu11;
461451
INFOPLIST_FILE = image_picker_exampleTests/Info.plist;
462452
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
@@ -489,7 +479,6 @@
489479
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
490480
CODE_SIGN_IDENTITY = "iPhone Developer";
491481
CODE_SIGN_STYLE = Automatic;
492-
DEVELOPMENT_TEAM = S8QB4VV633;
493482
GCC_C_LANGUAGE_STANDARD = gnu11;
494483
INFOPLIST_FILE = image_picker_exampleTests/Info.plist;
495484
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
@@ -507,19 +496,28 @@
507496
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
508497
buildSettings = {
509498
ALWAYS_SEARCH_USER_PATHS = NO;
499+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
510500
CLANG_ANALYZER_NONNULL = YES;
511501
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
512502
CLANG_CXX_LIBRARY = "libc++";
513503
CLANG_ENABLE_MODULES = YES;
514504
CLANG_ENABLE_OBJC_ARC = YES;
505+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
515506
CLANG_WARN_BOOL_CONVERSION = YES;
507+
CLANG_WARN_COMMA = YES;
516508
CLANG_WARN_CONSTANT_CONVERSION = YES;
509+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
517510
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
518511
CLANG_WARN_EMPTY_BODY = YES;
519512
CLANG_WARN_ENUM_CONVERSION = YES;
520513
CLANG_WARN_INFINITE_RECURSION = YES;
521514
CLANG_WARN_INT_CONVERSION = YES;
515+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
516+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
517+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
522518
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
519+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
520+
CLANG_WARN_STRICT_PROTOTYPES = YES;
523521
CLANG_WARN_SUSPICIOUS_MOVE = YES;
524522
CLANG_WARN_UNREACHABLE_CODE = YES;
525523
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -555,19 +553,28 @@
555553
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
556554
buildSettings = {
557555
ALWAYS_SEARCH_USER_PATHS = NO;
556+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
558557
CLANG_ANALYZER_NONNULL = YES;
559558
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
560559
CLANG_CXX_LIBRARY = "libc++";
561560
CLANG_ENABLE_MODULES = YES;
562561
CLANG_ENABLE_OBJC_ARC = YES;
562+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
563563
CLANG_WARN_BOOL_CONVERSION = YES;
564+
CLANG_WARN_COMMA = YES;
564565
CLANG_WARN_CONSTANT_CONVERSION = YES;
566+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
565567
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
566568
CLANG_WARN_EMPTY_BODY = YES;
567569
CLANG_WARN_ENUM_CONVERSION = YES;
568570
CLANG_WARN_INFINITE_RECURSION = YES;
569571
CLANG_WARN_INT_CONVERSION = YES;
572+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
573+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
574+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
570575
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
576+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
577+
CLANG_WARN_STRICT_PROTOTYPES = YES;
571578
CLANG_WARN_SUSPICIOUS_MOVE = YES;
572579
CLANG_WARN_UNREACHABLE_CODE = YES;
573580
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -596,7 +603,6 @@
596603
isa = XCBuildConfiguration;
597604
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
598605
buildSettings = {
599-
ARCHS = arm64;
600606
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
601607
DEVELOPMENT_TEAM = "";
602608
ENABLE_BITCODE = NO;
@@ -619,7 +625,6 @@
619625
isa = XCBuildConfiguration;
620626
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
621627
buildSettings = {
622-
ARCHS = arm64;
623628
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
624629
DEVELOPMENT_TEAM = "";
625630
ENABLE_BITCODE = NO;

‎packages/image_picker/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
34+
BuildableName = "Runner.app"
35+
BlueprintName = "Runner"
36+
ReferencedContainer = "container:Runner.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
46-
BuildableName = "Runner.app"
47-
BlueprintName = "Runner"
48-
ReferencedContainer = "container:Runner.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:Runner.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎packages/image_picker/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors:
55
- Flutter Team <[email protected]>
66
- Rhodes Davis Jr. <[email protected]>
77
homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
8-
version: 0.6.1+4
8+
version: 0.6.1+5
99

1010
flutter:
1111
plugin:

0 commit comments

Comments
 (0)