Skip to content

Commit a50316b

Browse files
committed
Updates iOS configuration & bump xcode configs
1 parent 4336797 commit a50316b

File tree

12 files changed

+315
-54
lines changed

12 files changed

+315
-54
lines changed

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
.DS_Store
2-
.atom/
3-
.idea
2+
.dart_tool/
3+
44
.packages
55
.pub/
6+
67
build/
7-
ios/.generated/
8-
packages
9-
pubspec.lock

example/.gitignore

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,72 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
16
.DS_Store
27
.atom/
3-
.idea
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
16+
.idea/
17+
18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
22+
23+
# Flutter/Dart/Pub related
24+
**/doc/api/
25+
.dart_tool/
26+
.flutter-plugins
427
.packages
28+
.pub-cache/
529
.pub/
6-
build/
7-
ios/.generated/
8-
packages
9-
pubspec.lock
10-
.flutter-plugins
30+
/build/
31+
32+
# Android related
33+
**/android/**/gradle-wrapper.jar
34+
**/android/.gradle
35+
**/android/captures/
36+
**/android/gradlew
37+
**/android/gradlew.bat
38+
**/android/local.properties
39+
**/android/**/GeneratedPluginRegistrant.java
40+
41+
# iOS/XCode related
42+
**/ios/**/*.mode1v3
43+
**/ios/**/*.mode2v3
44+
**/ios/**/*.moved-aside
45+
**/ios/**/*.pbxuser
46+
**/ios/**/*.perspectivev3
47+
**/ios/**/*sync/
48+
**/ios/**/.sconsign.dblite
49+
**/ios/**/.tags*
50+
**/ios/**/.vagrant/
51+
**/ios/**/DerivedData/
52+
**/ios/**/Icon?
53+
**/ios/**/Pods/
54+
**/ios/**/.symlinks/
55+
**/ios/**/profile
56+
**/ios/**/xcuserdata
57+
**/ios/.generated/
58+
**/ios/Flutter/App.framework
59+
**/ios/Flutter/Flutter.framework
60+
**/ios/Flutter/Generated.xcconfig
61+
**/ios/Flutter/app.flx
62+
**/ios/Flutter/app.zip
63+
**/ios/Flutter/flutter_assets/
64+
**/ios/ServiceDefinitions.json
65+
**/ios/Runner/GeneratedPluginRegistrant.*
66+
67+
# Exceptions to above rules.
68+
!**/ios/**/default.mode1v3
69+
!**/ios/**/default.mode2v3
70+
!**/ios/**/default.pbxuser
71+
!**/ios/**/default.perspectivev3
72+
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

example/ios/Flutter/Debug.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

example/ios/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ PODS:
44
- Flutter
55

66
DEPENDENCIES:
7-
- Flutter (from `/Users/clovisnicolas/flutter/bin/cache/artifacts/engine/ios`)
8-
- screen (from `/Users/clovisnicolas/screen/ios`)
7+
- Flutter (from `/Users/ened/dev/flutter/bin/cache/artifacts/engine/ios`)
8+
- screen (from `/Users/ened/git/ened.flutter_screen/ios`)
99

1010
EXTERNAL SOURCES:
1111
Flutter:
12-
:path: /Users/clovisnicolas/flutter/bin/cache/artifacts/engine/ios
12+
:path: "/Users/ened/dev/flutter/bin/cache/artifacts/engine/ios"
1313
screen:
14-
:path: /Users/clovisnicolas/screen/ios
14+
:path: "/Users/ened/git/ened.flutter_screen/ios"
1515

1616
SPEC CHECKSUMS:
17-
Flutter: d674e78c937094a75ac71dd77e921e840bea3dbf
17+
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
1818
screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
1919

2020
PODFILE CHECKSUM: 351e02e34b831289961ec3558a535cbd2c4965d2
2121

22-
COCOAPODS: 1.3.1
22+
COCOAPODS: 1.7.0

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +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 */; };
18-
9740EEBB1CF902C7004384FC /* app.flx in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB71CF902C7004384FC /* app.flx */; };
1916
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2017
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2118
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -43,14 +40,15 @@
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>"; };
4542
14BD94A89D6F1A093A0085A4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
43+
29BEE2CBEE5C29DA1E523573 /* 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>"; };
4644
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4745
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
46+
74FDA7642B40C76BC3737FD6 /* 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>"; };
4847
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4948
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5049
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5150
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5251
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
53-
9740EEB71CF902C7004384FC /* app.flx */ = {isa = PBXFileReference; lastKnownFileType = file; name = app.flx; path = Flutter/app.flx; sourceTree = "<group>"; };
5452
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5553
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5654
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -85,14 +83,15 @@
8583
5A2CFD786E24081179E5012F /* Pods */ = {
8684
isa = PBXGroup;
8785
children = (
86+
74FDA7642B40C76BC3737FD6 /* Pods-Runner.debug.xcconfig */,
87+
29BEE2CBEE5C29DA1E523573 /* Pods-Runner.release.xcconfig */,
8888
);
8989
name = Pods;
9090
sourceTree = "<group>";
9191
};
9292
9740EEB11CF90186004384FC /* Flutter */ = {
9393
isa = PBXGroup;
9494
children = (
95-
9740EEB71CF902C7004384FC /* app.flx */,
9695
3B80C3931E831B6300D905FE /* App.framework */,
9796
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
9897
9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -161,7 +160,6 @@
161160
9705A1C41CF9048500538489 /* Embed Frameworks */,
162161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
163162
21C91CD328302AE1A6EB572C /* [CP] Embed Pods Frameworks */,
164-
0AEDE44341E1CA4D7603D540 /* [CP] Copy Pods Resources */,
165163
);
166164
buildRules = (
167165
);
@@ -178,18 +176,18 @@
178176
97C146E61CF9000F007C117D /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 0910;
179+
LastUpgradeCheck = 1020;
182180
ORGANIZATIONNAME = "The Chromium Authors";
183181
TargetAttributes = {
184182
97C146ED1CF9000F007C117D = {
185183
CreatedOnToolsVersion = 7.3.1;
186-
DevelopmentTeam = PLYDCCZ843;
184+
DevelopmentTeam = 7X4LHQK32Q;
187185
};
188186
};
189187
};
190188
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
191189
compatibilityVersion = "Xcode 3.2";
192-
developmentRegion = English;
190+
developmentRegion = en;
193191
hasScannedForEncodings = 0;
194192
knownRegions = (
195193
en,
@@ -210,11 +208,8 @@
210208
isa = PBXResourcesBuildPhase;
211209
buildActionMask = 2147483647;
212210
files = (
213-
9740EEBB1CF902C7004384FC /* app.flx in Resources */,
214211
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
215-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
216212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
217-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
218213
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
219214
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
220215
);
@@ -223,37 +218,22 @@
223218
/* End PBXResourcesBuildPhase section */
224219

225220
/* Begin PBXShellScriptBuildPhase section */
226-
0AEDE44341E1CA4D7603D540 /* [CP] Copy Pods Resources */ = {
227-
isa = PBXShellScriptBuildPhase;
228-
buildActionMask = 2147483647;
229-
files = (
230-
);
231-
inputPaths = (
232-
);
233-
name = "[CP] Copy Pods Resources";
234-
outputPaths = (
235-
);
236-
runOnlyForDeploymentPostprocessing = 0;
237-
shellPath = /bin/sh;
238-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
239-
showEnvVarsInLog = 0;
240-
};
241221
21C91CD328302AE1A6EB572C /* [CP] Embed Pods Frameworks */ = {
242222
isa = PBXShellScriptBuildPhase;
243223
buildActionMask = 2147483647;
244224
files = (
245225
);
246226
inputPaths = (
247-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
248-
"${PODS_ROOT}/../../../../flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
227+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
228+
"${PODS_ROOT}/../../../../../dev/flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
249229
);
250230
name = "[CP] Embed Pods Frameworks";
251231
outputPaths = (
252232
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
253233
);
254234
runOnlyForDeploymentPostprocessing = 0;
255235
shellPath = /bin/sh;
256-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
236+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
257237
showEnvVarsInLog = 0;
258238
};
259239
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
@@ -342,6 +322,7 @@
342322
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
343323
buildSettings = {
344324
ALWAYS_SEARCH_USER_PATHS = NO;
325+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
345326
CLANG_ANALYZER_NONNULL = YES;
346327
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
347328
CLANG_CXX_LIBRARY = "libc++";
@@ -351,12 +332,14 @@
351332
CLANG_WARN_BOOL_CONVERSION = YES;
352333
CLANG_WARN_COMMA = YES;
353334
CLANG_WARN_CONSTANT_CONVERSION = YES;
335+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
354336
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
355337
CLANG_WARN_EMPTY_BODY = YES;
356338
CLANG_WARN_ENUM_CONVERSION = YES;
357339
CLANG_WARN_INFINITE_RECURSION = YES;
358340
CLANG_WARN_INT_CONVERSION = YES;
359341
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
342+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
360343
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
361344
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
362345
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -396,6 +379,7 @@
396379
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
397380
buildSettings = {
398381
ALWAYS_SEARCH_USER_PATHS = NO;
382+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
399383
CLANG_ANALYZER_NONNULL = YES;
400384
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
401385
CLANG_CXX_LIBRARY = "libc++";
@@ -405,12 +389,14 @@
405389
CLANG_WARN_BOOL_CONVERSION = YES;
406390
CLANG_WARN_COMMA = YES;
407391
CLANG_WARN_CONSTANT_CONVERSION = YES;
392+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
408393
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
409394
CLANG_WARN_EMPTY_BODY = YES;
410395
CLANG_WARN_ENUM_CONVERSION = YES;
411396
CLANG_WARN_INFINITE_RECURSION = YES;
412397
CLANG_WARN_INT_CONVERSION = YES;
413398
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
399+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
414400
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
415401
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
416402
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -443,9 +429,8 @@
443429
isa = XCBuildConfiguration;
444430
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
445431
buildSettings = {
446-
ARCHS = arm64;
447432
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
448-
DEVELOPMENT_TEAM = PLYDCCZ843;
433+
DEVELOPMENT_TEAM = 7X4LHQK32Q;
449434
ENABLE_BITCODE = NO;
450435
FRAMEWORK_SEARCH_PATHS = (
451436
"$(inherited)",
@@ -466,9 +451,8 @@
466451
isa = XCBuildConfiguration;
467452
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
468453
buildSettings = {
469-
ARCHS = arm64;
470454
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
471-
DEVELOPMENT_TEAM = PLYDCCZ843;
455+
DEVELOPMENT_TEAM = 7X4LHQK32Q;
472456
ENABLE_BITCODE = NO;
473457
FRAMEWORK_SEARCH_PATHS = (
474458
"$(inherited)",

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 3 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 = "0910"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)