Skip to content

Commit 89acdfb

Browse files
jmagmanPark Sung Min
jmagman
authored and
Park Sung Min
committed
[camera] Update and migrate iOS example project (flutter#2090)
1. Let flutter/flutter#26630 flutter_assets migrator run 2. Run `pod install` so flutter_assets is removed from the asset copy build phase 3. Migrate deprecated "English" to "en" language 4. Allow Xcode to remove extraneous xcconfigs, see flutter/flutter#38724 5. Let Xcode 11 update build settings 6. Remove DEVELOPMENT_TEAM references since having those provisioning profiles should not be required to run the examples (most examples don't have one) 7. Looks like this was last run with `use_frameworks!`? Let CocoaPods build as libraries instead of frameworks. 8. Remove ARCHS, which was causing a compilation error
1 parent ff547f9 commit 89acdfb

File tree

4 files changed

+33
-43
lines changed

4 files changed

+33
-43
lines changed

‎packages/camera/CHANGELOG.md

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

37
* Fix Android NullPointerException on devices with only front-facing camera.

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

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
75201D617916C49BDEDF852A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 620DDA07C00B5FF2F937CB5B /* libPods-Runner.a */; };
1615
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1716
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
18-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
19-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
2017
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2118
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2219
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -42,9 +39,9 @@
4239
/* Begin PBXFileReference section */
4340
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4441
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4642
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4743
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
44+
483D985F075B951ADBAD218E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4845
620DDA07C00B5FF2F937CB5B /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4946
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5047
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -58,6 +55,7 @@
5855
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5956
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6057
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
58+
9AC7510327AD6A32B7CBD9A5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
6159
/* End PBXFileReference section */
6260

6361
/* Begin PBXFrameworksBuildPhase section */
@@ -87,7 +85,6 @@
8785
children = (
8886
3B80C3931E831B6300D905FE /* App.framework */,
8987
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
90-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9188
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9289
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9390
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -142,6 +139,8 @@
142139
C52D9D4A70956403860EBEB5 /* Pods */ = {
143140
isa = PBXGroup;
144141
children = (
142+
9AC7510327AD6A32B7CBD9A5 /* Pods-Runner.debug.xcconfig */,
143+
483D985F075B951ADBAD218E /* Pods-Runner.release.xcconfig */,
145144
);
146145
name = Pods;
147146
sourceTree = "<group>";
@@ -161,7 +160,6 @@
161160
9705A1C41CF9048500538489 /* Embed Frameworks */,
162161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
163162
FE224661708E6DA2A0F8B952 /* [CP] Embed Pods Frameworks */,
164-
EACF0929FF12B6CC70C2D6BE /* [CP] Copy Pods Resources */,
165163
);
166164
buildRules = (
167165
);
@@ -178,18 +176,17 @@
178176
97C146E61CF9000F007C117D /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
182180
ORGANIZATIONNAME = "The Chromium Authors";
183181
TargetAttributes = {
184182
97C146ED1CF9000F007C117D = {
185183
CreatedOnToolsVersion = 7.3.1;
186-
DevelopmentTeam = EQHXZ8M8AV;
187184
};
188185
};
189186
};
190187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
191188
compatibilityVersion = "Xcode 3.2";
192-
developmentRegion = English;
189+
developmentRegion = en;
193190
hasScannedForEncodings = 0;
194191
knownRegions = (
195192
en,
@@ -211,10 +208,7 @@
211208
buildActionMask = 2147483647;
212209
files = (
213210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
214-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
215211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
216-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
217-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
218212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
219213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
220214
);
@@ -269,37 +263,19 @@
269263
shellPath = /bin/sh;
270264
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
271265
};
272-
EACF0929FF12B6CC70C2D6BE /* [CP] Copy Pods Resources */ = {
273-
isa = PBXShellScriptBuildPhase;
274-
buildActionMask = 2147483647;
275-
files = (
276-
);
277-
inputPaths = (
278-
);
279-
name = "[CP] Copy Pods Resources";
280-
outputPaths = (
281-
);
282-
runOnlyForDeploymentPostprocessing = 0;
283-
shellPath = /bin/sh;
284-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
285-
showEnvVarsInLog = 0;
286-
};
287266
FE224661708E6DA2A0F8B952 /* [CP] Embed Pods Frameworks */ = {
288267
isa = PBXShellScriptBuildPhase;
289268
buildActionMask = 2147483647;
290269
files = (
291270
);
292271
inputPaths = (
293-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
294-
"${PODS_ROOT}/../../../../../../flutter/bin/cache/artifacts/engine/ios-release/Flutter.framework",
295272
);
296273
name = "[CP] Embed Pods Frameworks";
297274
outputPaths = (
298-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
299275
);
300276
runOnlyForDeploymentPostprocessing = 0;
301277
shellPath = /bin/sh;
302-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
278+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
303279
showEnvVarsInLog = 0;
304280
};
305281
/* End PBXShellScriptBuildPhase section */
@@ -342,19 +318,28 @@
342318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
343319
buildSettings = {
344320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
345322
CLANG_ANALYZER_NONNULL = YES;
346323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
347324
CLANG_CXX_LIBRARY = "libc++";
348325
CLANG_ENABLE_MODULES = YES;
349326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
350328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
351330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
352332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
353333
CLANG_WARN_EMPTY_BODY = YES;
354334
CLANG_WARN_ENUM_CONVERSION = YES;
355335
CLANG_WARN_INFINITE_RECURSION = YES;
356336
CLANG_WARN_INT_CONVERSION = YES;
337+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
338+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
339+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
357340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
358343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
359344
CLANG_WARN_UNREACHABLE_CODE = YES;
360345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -390,19 +375,28 @@
390375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
391376
buildSettings = {
392377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
393379
CLANG_ANALYZER_NONNULL = YES;
394380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
395381
CLANG_CXX_LIBRARY = "libc++";
396382
CLANG_ENABLE_MODULES = YES;
397383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
398385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
399387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
400389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
401390
CLANG_WARN_EMPTY_BODY = YES;
402391
CLANG_WARN_ENUM_CONVERSION = YES;
403392
CLANG_WARN_INFINITE_RECURSION = YES;
404393
CLANG_WARN_INT_CONVERSION = YES;
394+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
395+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
396+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
405397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
406400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
407401
CLANG_WARN_UNREACHABLE_CODE = YES;
408402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -431,9 +425,7 @@
431425
isa = XCBuildConfiguration;
432426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
433427
buildSettings = {
434-
ARCHS = arm64;
435428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
436-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
437429
ENABLE_BITCODE = NO;
438430
FRAMEWORK_SEARCH_PATHS = (
439431
"$(inherited)",
@@ -454,9 +446,7 @@
454446
isa = XCBuildConfiguration;
455447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
456448
buildSettings = {
457-
ARCHS = arm64;
458449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
459-
DEVELOPMENT_TEAM = EQHXZ8M8AV;
460450
ENABLE_BITCODE = NO;
461451
FRAMEWORK_SEARCH_PATHS = (
462452
"$(inherited)",

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

Lines changed: 3 additions & 7 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"
@@ -26,10 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
31-
<Testables>
32-
</Testables>
3330
<MacroExpansion>
3431
<BuildableReference
3532
BuildableIdentifier = "primary"
@@ -39,14 +36,13 @@
3936
ReferencedContainer = "container:Runner.xcodeproj">
4037
</BuildableReference>
4138
</MacroExpansion>
42-
<AdditionalOptions>
43-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4441
</TestAction>
4542
<LaunchAction
4643
buildConfiguration = "Debug"
4744
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4845
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5046
launchStyle = "0"
5147
useCustomWorkingDirectory = "NO"
5248
ignoresPersistentStateOnLaunch = "NO"

‎packages/camera/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera
22
description: A Flutter plugin for getting information about and controlling the
33
camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
44
and streaming image buffers to dart.
5-
version: 0.5.4+2
5+
version: 0.5.4+3
66

77
authors:
88
- Flutter Team <[email protected]>

0 commit comments

Comments
 (0)