Skip to content

Commit bf95f6e

Browse files
jmagmanPark Sung Min
jmagman
authored and
Park Sung Min
committed
[url_launcher] Update and migrate iOS example project (flutter#2109)
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 extraneous framework outputs flutter/flutter#20685
1 parent ce0a87e commit bf95f6e

File tree

4 files changed

+32
-40
lines changed

4 files changed

+32
-40
lines changed

‎packages/url_launcher/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 5.1.4
2+
3+
* Update and migrate iOS example project.
14

25
## 5.1.3
36

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

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1110
2D92223F1EC1DA93007564B0 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D92223E1EC1DA93007564B0 /* GeneratedPluginRegistrant.m */; };
1211
2E37D9A274B2EACB147AC51B /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 856D0913184F79C678A42603 /* libPods-Runner.a */; };
1312
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1413
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1514
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
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 */; };
@@ -40,14 +37,14 @@
4037
/* End PBXCopyFilesBuildPhase section */
4138

4239
/* Begin PBXFileReference section */
43-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4440
2D92223D1EC1DA93007564B0 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneratedPluginRegistrant.h; path = Runner/GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4541
2D92223E1EC1DA93007564B0 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GeneratedPluginRegistrant.m; path = Runner/GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
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>"; };
4844
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4945
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5046
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
47+
836316F9AEA584411312E29F /* 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>"; };
5148
856D0913184F79C678A42603 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5249
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5350
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; 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+
A84BFEE343F54B983D1B67EB /* 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>"; };
6159
/* End PBXFileReference section */
6260

6361
/* Begin PBXFrameworksBuildPhase section */
@@ -77,6 +75,8 @@
7775
840012C8B5EDBCF56B0E4AC1 /* Pods */ = {
7876
isa = PBXGroup;
7977
children = (
78+
836316F9AEA584411312E29F /* Pods-Runner.debug.xcconfig */,
79+
A84BFEE343F54B983D1B67EB /* Pods-Runner.release.xcconfig */,
8080
);
8181
name = Pods;
8282
sourceTree = "<group>";
@@ -86,7 +86,6 @@
8686
children = (
8787
3B80C3931E831B6300D905FE /* App.framework */,
8888
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
89-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9089
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9190
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9291
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -160,7 +159,6 @@
160159
97C146EC1CF9000F007C117D /* Resources */,
161160
9705A1C41CF9048500538489 /* Embed Frameworks */,
162161
95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */,
163-
532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */,
164162
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
165163
);
166164
buildRules = (
@@ -178,7 +176,7 @@
178176
97C146E61CF9000F007C117D /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
182180
ORGANIZATIONNAME = "The Chromium Authors";
183181
TargetAttributes = {
184182
97C146ED1CF9000F007C117D = {
@@ -188,7 +186,7 @@
188186
};
189187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
190188
compatibilityVersion = "Xcode 3.2";
191-
developmentRegion = English;
189+
developmentRegion = en;
192190
hasScannedForEncodings = 0;
193191
knownRegions = (
194192
en,
@@ -210,10 +208,7 @@
210208
buildActionMask = 2147483647;
211209
files = (
212210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
213-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
214211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
215-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
216-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
217212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
218213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
219214
);
@@ -236,37 +231,19 @@
236231
shellPath = /bin/sh;
237232
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
238233
};
239-
532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */ = {
240-
isa = PBXShellScriptBuildPhase;
241-
buildActionMask = 2147483647;
242-
files = (
243-
);
244-
inputPaths = (
245-
);
246-
name = "[CP] Copy Pods Resources";
247-
outputPaths = (
248-
);
249-
runOnlyForDeploymentPostprocessing = 0;
250-
shellPath = /bin/sh;
251-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
252-
showEnvVarsInLog = 0;
253-
};
254234
95BB15E9E1769C0D146AA592 /* [CP] Embed Pods Frameworks */ = {
255235
isa = PBXShellScriptBuildPhase;
256236
buildActionMask = 2147483647;
257237
files = (
258238
);
259239
inputPaths = (
260-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
261-
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
262240
);
263241
name = "[CP] Embed Pods Frameworks";
264242
outputPaths = (
265-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
266243
);
267244
runOnlyForDeploymentPostprocessing = 0;
268245
shellPath = /bin/sh;
269-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
246+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
270247
showEnvVarsInLog = 0;
271248
};
272249
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -341,19 +318,28 @@
341318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
342319
buildSettings = {
343320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
344322
CLANG_ANALYZER_NONNULL = YES;
345323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
346324
CLANG_CXX_LIBRARY = "libc++";
347325
CLANG_ENABLE_MODULES = YES;
348326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
349328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
350330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
351332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
352333
CLANG_WARN_EMPTY_BODY = YES;
353334
CLANG_WARN_ENUM_CONVERSION = YES;
354335
CLANG_WARN_INFINITE_RECURSION = YES;
355336
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;
356340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
357343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
358344
CLANG_WARN_UNREACHABLE_CODE = YES;
359345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -389,19 +375,28 @@
389375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
390376
buildSettings = {
391377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
392379
CLANG_ANALYZER_NONNULL = YES;
393380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
394381
CLANG_CXX_LIBRARY = "libc++";
395382
CLANG_ENABLE_MODULES = YES;
396383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
397385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
398387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
399389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
400390
CLANG_WARN_EMPTY_BODY = YES;
401391
CLANG_WARN_ENUM_CONVERSION = YES;
402392
CLANG_WARN_INFINITE_RECURSION = YES;
403393
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;
404397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
405400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
406401
CLANG_WARN_UNREACHABLE_CODE = YES;
407402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -430,7 +425,6 @@
430425
isa = XCBuildConfiguration;
431426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
432427
buildSettings = {
433-
ARCHS = arm64;
434428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
435429
ENABLE_BITCODE = NO;
436430
FRAMEWORK_SEARCH_PATHS = (
@@ -452,7 +446,6 @@
452446
isa = XCBuildConfiguration;
453447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
454448
buildSettings = {
455-
ARCHS = arm64;
456449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
457450
ENABLE_BITCODE = NO;
458451
FRAMEWORK_SEARCH_PATHS = (

‎packages/url_launcher/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"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎packages/url_launcher/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for launching a URL on Android and iOS. Supports
33
web, phone, SMS, and email schemes.
44
author: Flutter Team <[email protected]>
55
homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher
6-
version: 5.1.3
6+
version: 5.1.4
77

88
flutter:
99
plugin:

0 commit comments

Comments
 (0)