Skip to content

Commit 19dcadd

Browse files
jmagmanmormih
jmagman
authored and
mormih
committed
[package_info] Update and migrate iOS example project (flutter#2098)
1 parent ad92f5a commit 19dcadd

File tree

4 files changed

+33
-45
lines changed

4 files changed

+33
-45
lines changed

‎packages/package_info/CHANGELOG.md‎

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

37
* Fix Android compiler warnings.

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

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
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 */; };
13-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1412
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1513
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1614
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1715
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 */; };
2016
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2117
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2218
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -41,16 +37,16 @@
4137
/* End PBXCopyFilesBuildPhase section */
4238

4339
/* Begin PBXFileReference section */
40+
0B4CD678E84FD9C2C80D895C /* 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>"; };
4441
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4542
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
46-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4743
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
48-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4944
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
5045
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5146
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5247
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5348
7D007BB586407934FC28AF83 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
49+
8F88DBCB0DD2793F05ADE394 /* 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>"; };
5450
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5551
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
5652
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
@@ -79,6 +75,8 @@
7975
1B8D0C5C4E228D9E0271D922 /* Pods */ = {
8076
isa = PBXGroup;
8177
children = (
78+
0B4CD678E84FD9C2C80D895C /* Pods-Runner.debug.xcconfig */,
79+
8F88DBCB0DD2793F05ADE394 /* Pods-Runner.release.xcconfig */,
8280
);
8381
name = Pods;
8482
sourceTree = "<group>";
@@ -88,7 +86,6 @@
8886
children = (
8987
3B80C3931E831B6300D905FE /* App.framework */,
9088
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
91-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9289
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9390
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9491
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -163,7 +160,6 @@
163160
9705A1C41CF9048500538489 /* Embed Frameworks */,
164161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
165162
1B10719E4FA771B320770278 /* [CP] Embed Pods Frameworks */,
166-
8BC53FB967E57DED6A71F196 /* [CP] Copy Pods Resources */,
167163
);
168164
buildRules = (
169165
);
@@ -180,18 +176,17 @@
180176
97C146E61CF9000F007C117D /* Project object */ = {
181177
isa = PBXProject;
182178
attributes = {
183-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
184180
ORGANIZATIONNAME = "The Chromium Authors";
185181
TargetAttributes = {
186182
97C146ED1CF9000F007C117D = {
187183
CreatedOnToolsVersion = 7.3.1;
188-
DevelopmentTeam = JSJA5AH6K6;
189184
};
190185
};
191186
};
192187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
193188
compatibilityVersion = "Xcode 3.2";
194-
developmentRegion = English;
189+
developmentRegion = en;
195190
hasScannedForEncodings = 0;
196191
knownRegions = (
197192
en,
@@ -213,10 +208,7 @@
213208
buildActionMask = 2147483647;
214209
files = (
215210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
216-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
217211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
218-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
219-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
220212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
221213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
222214
);
@@ -231,16 +223,13 @@
231223
files = (
232224
);
233225
inputPaths = (
234-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
235-
"${PODS_ROOT}/../../../../../../flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
236226
);
237227
name = "[CP] Embed Pods Frameworks";
238228
outputPaths = (
239-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
240229
);
241230
runOnlyForDeploymentPostprocessing = 0;
242231
shellPath = /bin/sh;
243-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
232+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
244233
showEnvVarsInLog = 0;
245234
};
246235
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
@@ -257,21 +246,6 @@
257246
shellPath = /bin/sh;
258247
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
259248
};
260-
8BC53FB967E57DED6A71F196 /* [CP] Copy Pods Resources */ = {
261-
isa = PBXShellScriptBuildPhase;
262-
buildActionMask = 2147483647;
263-
files = (
264-
);
265-
inputPaths = (
266-
);
267-
name = "[CP] Copy Pods Resources";
268-
outputPaths = (
269-
);
270-
runOnlyForDeploymentPostprocessing = 0;
271-
shellPath = /bin/sh;
272-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
273-
showEnvVarsInLog = 0;
274-
};
275249
9740EEB61CF901F6004384FC /* Run Script */ = {
276250
isa = PBXShellScriptBuildPhase;
277251
buildActionMask = 2147483647;
@@ -344,19 +318,28 @@
344318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
345319
buildSettings = {
346320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
347322
CLANG_ANALYZER_NONNULL = YES;
348323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
349324
CLANG_CXX_LIBRARY = "libc++";
350325
CLANG_ENABLE_MODULES = YES;
351326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
352328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
353330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
354332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
355333
CLANG_WARN_EMPTY_BODY = YES;
356334
CLANG_WARN_ENUM_CONVERSION = YES;
357335
CLANG_WARN_INFINITE_RECURSION = YES;
358336
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;
359340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
360343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
361344
CLANG_WARN_UNREACHABLE_CODE = YES;
362345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -392,19 +375,28 @@
392375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
393376
buildSettings = {
394377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
395379
CLANG_ANALYZER_NONNULL = YES;
396380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
397381
CLANG_CXX_LIBRARY = "libc++";
398382
CLANG_ENABLE_MODULES = YES;
399383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
400385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
401387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
402389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
403390
CLANG_WARN_EMPTY_BODY = YES;
404391
CLANG_WARN_ENUM_CONVERSION = YES;
405392
CLANG_WARN_INFINITE_RECURSION = YES;
406393
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;
407397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
408400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
409401
CLANG_WARN_UNREACHABLE_CODE = YES;
410402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -433,9 +425,7 @@
433425
isa = XCBuildConfiguration;
434426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
435427
buildSettings = {
436-
ARCHS = arm64;
437428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
438-
DEVELOPMENT_TEAM = JSJA5AH6K6;
439429
ENABLE_BITCODE = NO;
440430
FRAMEWORK_SEARCH_PATHS = (
441431
"$(inherited)",
@@ -456,9 +446,7 @@
456446
isa = XCBuildConfiguration;
457447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
458448
buildSettings = {
459-
ARCHS = arm64;
460449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
461-
DEVELOPMENT_TEAM = JSJA5AH6K6;
462450
ENABLE_BITCODE = NO;
463451
FRAMEWORK_SEARCH_PATHS = (
464452
"$(inherited)",

‎packages/package_info/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/package_info/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
33
package, such as CFBundleVersion on iOS or versionCode on Android.
44
author: Flutter Team <flutter-dev@googlegroups.com>
55
homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
6-
version: 0.4.0+6
6+
version: 0.4.0+7
77

88
flutter:
99
plugin:

0 commit comments

Comments
 (0)