Skip to content

Commit c973e2c

Browse files
committed
KB changes
1 parent 7ee607a commit c973e2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+522
-100
lines changed

ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 140 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,29 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1314
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1415
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1516
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
1617
/* End PBXBuildFile section */
1718

19+
/* Begin PBXContainerItemProxy section */
20+
331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
21+
isa = PBXContainerItemProxy;
22+
containerPortal = 97C146E61CF9000F007C117D /* Project object */;
23+
proxyType = 1;
24+
remoteGlobalIDString = 97C146ED1CF9000F007C117D;
25+
remoteInfo = Runner;
26+
};
27+
/* End PBXContainerItemProxy section */
28+
1829
/* Begin PBXCopyFilesBuildPhase section */
1930
9705A1C41CF9048500538489 /* Embed Frameworks */ = {
2031
isa = PBXCopyFilesBuildPhase;
@@ -31,6 +42,8 @@
3142
/* Begin PBXFileReference section */
3243
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3344
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45+
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
46+
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3447
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3548
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3649
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -55,6 +68,14 @@
5568
/* End PBXFrameworksBuildPhase section */
5669

5770
/* Begin PBXGroup section */
71+
331C8082294A63A400263BE5 /* RunnerTests */ = {
72+
isa = PBXGroup;
73+
children = (
74+
331C807B294A618700263BE5 /* RunnerTests.swift */,
75+
);
76+
path = RunnerTests;
77+
sourceTree = "<group>";
78+
};
5879
9740EEB11CF90186004384FC /* Flutter */ = {
5980
isa = PBXGroup;
6081
children = (
@@ -72,13 +93,15 @@
7293
9740EEB11CF90186004384FC /* Flutter */,
7394
97C146F01CF9000F007C117D /* Runner */,
7495
97C146EF1CF9000F007C117D /* Products */,
96+
331C8082294A63A400263BE5 /* RunnerTests */,
7597
);
7698
sourceTree = "<group>";
7799
};
78100
97C146EF1CF9000F007C117D /* Products */ = {
79101
isa = PBXGroup;
80102
children = (
81103
97C146EE1CF9000F007C117D /* Runner.app */,
104+
331C8081294A63A400263BE5 /* RunnerTests.xctest */,
82105
);
83106
name = Products;
84107
sourceTree = "<group>";
@@ -101,6 +124,23 @@
101124
/* End PBXGroup section */
102125

103126
/* Begin PBXNativeTarget section */
127+
331C8080294A63A400263BE5 /* RunnerTests */ = {
128+
isa = PBXNativeTarget;
129+
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130+
buildPhases = (
131+
331C807D294A63A400263BE5 /* Sources */,
132+
331C807F294A63A400263BE5 /* Resources */,
133+
);
134+
buildRules = (
135+
);
136+
dependencies = (
137+
331C8086294A63A400263BE5 /* PBXTargetDependency */,
138+
);
139+
name = RunnerTests;
140+
productName = RunnerTests;
141+
productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
142+
productType = "com.apple.product-type.bundle.unit-test";
143+
};
104144
97C146ED1CF9000F007C117D /* Runner */ = {
105145
isa = PBXNativeTarget;
106146
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
@@ -127,9 +167,14 @@
127167
97C146E61CF9000F007C117D /* Project object */ = {
128168
isa = PBXProject;
129169
attributes = {
130-
LastUpgradeCheck = 1300;
170+
BuildIndependentTargetsInParallel = YES;
171+
LastUpgradeCheck = 1510;
131172
ORGANIZATIONNAME = "";
132173
TargetAttributes = {
174+
331C8080294A63A400263BE5 = {
175+
CreatedOnToolsVersion = 14.0;
176+
TestTargetID = 97C146ED1CF9000F007C117D;
177+
};
133178
97C146ED1CF9000F007C117D = {
134179
CreatedOnToolsVersion = 7.3.1;
135180
LastSwiftMigration = 1100;
@@ -150,11 +195,19 @@
150195
projectRoot = "";
151196
targets = (
152197
97C146ED1CF9000F007C117D /* Runner */,
198+
331C8080294A63A400263BE5 /* RunnerTests */,
153199
);
154200
};
155201
/* End PBXProject section */
156202

157203
/* Begin PBXResourcesBuildPhase section */
204+
331C807F294A63A400263BE5 /* Resources */ = {
205+
isa = PBXResourcesBuildPhase;
206+
buildActionMask = 2147483647;
207+
files = (
208+
);
209+
runOnlyForDeploymentPostprocessing = 0;
210+
};
158211
97C146EC1CF9000F007C117D /* Resources */ = {
159212
isa = PBXResourcesBuildPhase;
160213
buildActionMask = 2147483647;
@@ -171,10 +224,12 @@
171224
/* Begin PBXShellScriptBuildPhase section */
172225
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173226
isa = PBXShellScriptBuildPhase;
227+
alwaysOutOfDate = 1;
174228
buildActionMask = 2147483647;
175229
files = (
176230
);
177231
inputPaths = (
232+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
178233
);
179234
name = "Thin Binary";
180235
outputPaths = (
@@ -185,6 +240,7 @@
185240
};
186241
9740EEB61CF901F6004384FC /* Run Script */ = {
187242
isa = PBXShellScriptBuildPhase;
243+
alwaysOutOfDate = 1;
188244
buildActionMask = 2147483647;
189245
files = (
190246
);
@@ -200,6 +256,14 @@
200256
/* End PBXShellScriptBuildPhase section */
201257

202258
/* Begin PBXSourcesBuildPhase section */
259+
331C807D294A63A400263BE5 /* Sources */ = {
260+
isa = PBXSourcesBuildPhase;
261+
buildActionMask = 2147483647;
262+
files = (
263+
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
264+
);
265+
runOnlyForDeploymentPostprocessing = 0;
266+
};
203267
97C146EA1CF9000F007C117D /* Sources */ = {
204268
isa = PBXSourcesBuildPhase;
205269
buildActionMask = 2147483647;
@@ -211,6 +275,14 @@
211275
};
212276
/* End PBXSourcesBuildPhase section */
213277

278+
/* Begin PBXTargetDependency section */
279+
331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
280+
isa = PBXTargetDependency;
281+
target = 97C146ED1CF9000F007C117D /* Runner */;
282+
targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
283+
};
284+
/* End PBXTargetDependency section */
285+
214286
/* Begin PBXVariantGroup section */
215287
97C146FA1CF9000F007C117D /* Main.storyboard */ = {
216288
isa = PBXVariantGroup;
@@ -235,6 +307,7 @@
235307
isa = XCBuildConfiguration;
236308
buildSettings = {
237309
ALWAYS_SEARCH_USER_PATHS = NO;
310+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
238311
CLANG_ANALYZER_NONNULL = YES;
239312
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
240313
CLANG_CXX_LIBRARY = "libc++";
@@ -264,6 +337,7 @@
264337
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
265338
ENABLE_NS_ASSERTIONS = NO;
266339
ENABLE_STRICT_OBJC_MSGSEND = YES;
340+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
267341
GCC_C_LANGUAGE_STANDARD = gnu99;
268342
GCC_NO_COMMON_BLOCKS = YES;
269343
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -272,7 +346,7 @@
272346
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
273347
GCC_WARN_UNUSED_FUNCTION = YES;
274348
GCC_WARN_UNUSED_VARIABLE = YES;
275-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
349+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
276350
MTL_ENABLE_DEBUG_INFO = NO;
277351
SDKROOT = iphoneos;
278352
SUPPORTED_PLATFORMS = iphoneos;
@@ -302,10 +376,58 @@
302376
};
303377
name = Profile;
304378
};
379+
331C8088294A63A400263BE5 /* Debug */ = {
380+
isa = XCBuildConfiguration;
381+
buildSettings = {
382+
BUNDLE_LOADER = "$(TEST_HOST)";
383+
CODE_SIGN_STYLE = Automatic;
384+
CURRENT_PROJECT_VERSION = 1;
385+
GENERATE_INFOPLIST_FILE = YES;
386+
MARKETING_VERSION = 1.0;
387+
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication.RunnerTests;
388+
PRODUCT_NAME = "$(TARGET_NAME)";
389+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
390+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
391+
SWIFT_VERSION = 5.0;
392+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
393+
};
394+
name = Debug;
395+
};
396+
331C8089294A63A400263BE5 /* Release */ = {
397+
isa = XCBuildConfiguration;
398+
buildSettings = {
399+
BUNDLE_LOADER = "$(TEST_HOST)";
400+
CODE_SIGN_STYLE = Automatic;
401+
CURRENT_PROJECT_VERSION = 1;
402+
GENERATE_INFOPLIST_FILE = YES;
403+
MARKETING_VERSION = 1.0;
404+
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication.RunnerTests;
405+
PRODUCT_NAME = "$(TARGET_NAME)";
406+
SWIFT_VERSION = 5.0;
407+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
408+
};
409+
name = Release;
410+
};
411+
331C808A294A63A400263BE5 /* Profile */ = {
412+
isa = XCBuildConfiguration;
413+
buildSettings = {
414+
BUNDLE_LOADER = "$(TEST_HOST)";
415+
CODE_SIGN_STYLE = Automatic;
416+
CURRENT_PROJECT_VERSION = 1;
417+
GENERATE_INFOPLIST_FILE = YES;
418+
MARKETING_VERSION = 1.0;
419+
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterApplication.RunnerTests;
420+
PRODUCT_NAME = "$(TARGET_NAME)";
421+
SWIFT_VERSION = 5.0;
422+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
423+
};
424+
name = Profile;
425+
};
305426
97C147031CF9000F007C117D /* Debug */ = {
306427
isa = XCBuildConfiguration;
307428
buildSettings = {
308429
ALWAYS_SEARCH_USER_PATHS = NO;
430+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
309431
CLANG_ANALYZER_NONNULL = YES;
310432
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
311433
CLANG_CXX_LIBRARY = "libc++";
@@ -335,6 +457,7 @@
335457
DEBUG_INFORMATION_FORMAT = dwarf;
336458
ENABLE_STRICT_OBJC_MSGSEND = YES;
337459
ENABLE_TESTABILITY = YES;
460+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
338461
GCC_C_LANGUAGE_STANDARD = gnu99;
339462
GCC_DYNAMIC_NO_PIC = NO;
340463
GCC_NO_COMMON_BLOCKS = YES;
@@ -349,7 +472,7 @@
349472
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
350473
GCC_WARN_UNUSED_FUNCTION = YES;
351474
GCC_WARN_UNUSED_VARIABLE = YES;
352-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
475+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
353476
MTL_ENABLE_DEBUG_INFO = YES;
354477
ONLY_ACTIVE_ARCH = YES;
355478
SDKROOT = iphoneos;
@@ -361,6 +484,7 @@
361484
isa = XCBuildConfiguration;
362485
buildSettings = {
363486
ALWAYS_SEARCH_USER_PATHS = NO;
487+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
364488
CLANG_ANALYZER_NONNULL = YES;
365489
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
366490
CLANG_CXX_LIBRARY = "libc++";
@@ -390,6 +514,7 @@
390514
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
391515
ENABLE_NS_ASSERTIONS = NO;
392516
ENABLE_STRICT_OBJC_MSGSEND = YES;
517+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
393518
GCC_C_LANGUAGE_STANDARD = gnu99;
394519
GCC_NO_COMMON_BLOCKS = YES;
395520
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -398,7 +523,7 @@
398523
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
399524
GCC_WARN_UNUSED_FUNCTION = YES;
400525
GCC_WARN_UNUSED_VARIABLE = YES;
401-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
526+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
402527
MTL_ENABLE_DEBUG_INFO = NO;
403528
SDKROOT = iphoneos;
404529
SUPPORTED_PLATFORMS = iphoneos;
@@ -455,6 +580,16 @@
455580
/* End XCBuildConfiguration section */
456581

457582
/* Begin XCConfigurationList section */
583+
331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
584+
isa = XCConfigurationList;
585+
buildConfigurations = (
586+
331C8088294A63A400263BE5 /* Debug */,
587+
331C8089294A63A400263BE5 /* Release */,
588+
331C808A294A63A400263BE5 /* Profile */,
589+
);
590+
defaultConfigurationIsVisible = 0;
591+
defaultConfigurationName = Release;
592+
};
458593
97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
459594
isa = XCConfigurationList;
460595
buildConfigurations = (

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,6 +37,17 @@
3737
</BuildableReference>
3838
</MacroExpansion>
3939
<Testables>
40+
<TestableReference
41+
skipped = "NO"
42+
parallelizable = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "331C8080294A63A400263BE5"
46+
BuildableName = "RunnerTests.xctest"
47+
BlueprintName = "RunnerTests"
48+
ReferencedContainer = "container:Runner.xcodeproj">
49+
</BuildableReference>
50+
</TestableReference>
4051
</Testables>
4152
</TestAction>
4253
<LaunchAction
@@ -48,6 +59,7 @@
4859
ignoresPersistentStateOnLaunch = "NO"
4960
debugDocumentVersioning = "YES"
5061
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
5163
allowLocationSimulation = "YES">
5264
<BuildableProductRunnable
5365
runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import UIKit
21
import Flutter
2+
import UIKit
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,
-269 Bytes
Loading
-877 Bytes
Loading
-1.11 KB
Loading
-743 Bytes
Loading
-1.22 KB
Loading
-1.19 KB
Loading

0 commit comments

Comments
 (0)