Skip to content

Commit 269510b

Browse files
jmagmanPark Sung Min
jmagman
authored and
Park Sung Min
committed
[connectivity] Update and migrate iOS example project (flutter#2091)
1 parent e378517 commit 269510b

4 files changed

Lines changed: 33 additions & 23 deletions

File tree

‎packages/connectivity/CHANGELOG.md‎

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

37
* Add `requestLocationServiceAuthorization` to request location authorization on iOS.

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

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1414
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1515
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
16-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
17-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
1816
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1917
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2018
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -41,8 +39,10 @@
4139
/* Begin PBXFileReference section */
4240
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4341
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
42+
3173C764DD180BE02EB51E47 /* 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>"; };
4443
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4544
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
45+
69D903F0A9A7C636EE803AF8 /* 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>"; };
4646
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4747
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4848
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -83,6 +83,8 @@
8383
8ECC1C323F60D5498EEC2315 /* Pods */ = {
8484
isa = PBXGroup;
8585
children = (
86+
69D903F0A9A7C636EE803AF8 /* Pods-Runner.debug.xcconfig */,
87+
3173C764DD180BE02EB51E47 /* Pods-Runner.release.xcconfig */,
8688
);
8789
name = Pods;
8890
sourceTree = "<group>";
@@ -174,18 +176,17 @@
174176
97C146E61CF9000F007C117D /* Project object */ = {
175177
isa = PBXProject;
176178
attributes = {
177-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
178180
ORGANIZATIONNAME = "The Chromium Authors";
179181
TargetAttributes = {
180182
97C146ED1CF9000F007C117D = {
181183
CreatedOnToolsVersion = 7.3.1;
182-
DevelopmentTeam = JSJA5AH6K6;
183184
};
184185
};
185186
};
186187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
187188
compatibilityVersion = "Xcode 3.2";
188-
developmentRegion = English;
189+
developmentRegion = en;
189190
hasScannedForEncodings = 0;
190191
knownRegions = (
191192
en,
@@ -207,9 +208,7 @@
207208
buildActionMask = 2147483647;
208209
files = (
209210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
210-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
211211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
212-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
213212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
214213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
215214
);
@@ -256,16 +255,13 @@
256255
files = (
257256
);
258257
inputPaths = (
259-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
260-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
261258
);
262259
name = "[CP] Embed Pods Frameworks";
263260
outputPaths = (
264-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
265261
);
266262
runOnlyForDeploymentPostprocessing = 0;
267263
shellPath = /bin/sh;
268-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
264+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
269265
showEnvVarsInLog = 0;
270266
};
271267
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -322,19 +318,28 @@
322318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
323319
buildSettings = {
324320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
325322
CLANG_ANALYZER_NONNULL = YES;
326323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
327324
CLANG_CXX_LIBRARY = "libc++";
328325
CLANG_ENABLE_MODULES = YES;
329326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
330328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
331330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
332332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
333333
CLANG_WARN_EMPTY_BODY = YES;
334334
CLANG_WARN_ENUM_CONVERSION = YES;
335335
CLANG_WARN_INFINITE_RECURSION = YES;
336336
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;
337340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
338343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
339344
CLANG_WARN_UNREACHABLE_CODE = YES;
340345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -370,19 +375,28 @@
370375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
371376
buildSettings = {
372377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
373379
CLANG_ANALYZER_NONNULL = YES;
374380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
375381
CLANG_CXX_LIBRARY = "libc++";
376382
CLANG_ENABLE_MODULES = YES;
377383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
378385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
379387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
380389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
381390
CLANG_WARN_EMPTY_BODY = YES;
382391
CLANG_WARN_ENUM_CONVERSION = YES;
383392
CLANG_WARN_INFINITE_RECURSION = YES;
384393
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;
385397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
386400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
387401
CLANG_WARN_UNREACHABLE_CODE = YES;
388402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -411,9 +425,7 @@
411425
isa = XCBuildConfiguration;
412426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
413427
buildSettings = {
414-
ARCHS = arm64;
415428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
416-
DEVELOPMENT_TEAM = JSJA5AH6K6;
417429
ENABLE_BITCODE = NO;
418430
FRAMEWORK_SEARCH_PATHS = (
419431
"$(inherited)",
@@ -434,9 +446,7 @@
434446
isa = XCBuildConfiguration;
435447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
436448
buildSettings = {
437-
ARCHS = arm64;
438449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
439-
DEVELOPMENT_TEAM = JSJA5AH6K6;
440450
ENABLE_BITCODE = NO;
441451
FRAMEWORK_SEARCH_PATHS = (
442452
"$(inherited)",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
33
mobile/cellular) connectivity on Android and iOS.
44
author: Flutter Team <[email protected]>
55
homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
6-
version: 0.4.4
6+
version: 0.4.4+1
77

88
flutter:
99
plugin:

0 commit comments

Comments
 (0)