Skip to content

Commit 1f6163f

Browse files
CarGuoCarGuo
committed
fix iOS
1 parent 4ae0da8 commit 1f6163f

7 files changed

Lines changed: 116 additions & 11 deletions

File tree

‎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>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎ios/Podfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ target 'Runner' do
3131
use_frameworks!
3232

3333
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
34-
target 'RunnerTests' do
35-
inherit! :search_paths
36-
end
3734
end
3835

3936
post_install do |installer|

‎ios/Podfile.lock‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
PODS:
2+
- Flutter (1.0.0)
3+
- rive_common (0.0.1):
4+
- Flutter
5+
6+
DEPENDENCIES:
7+
- Flutter (from `Flutter`)
8+
- rive_common (from `.symlinks/plugins/rive_common/ios`)
9+
10+
EXTERNAL SOURCES:
11+
Flutter:
12+
:path: Flutter
13+
rive_common:
14+
:path: ".symlinks/plugins/rive_common/ios"
15+
16+
SPEC CHECKSUMS:
17+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
18+
rive_common: 4743dbfd2911c99066547a3c6454681e0fa907df
19+
20+
PODFILE CHECKSUM: 5c8eb167e48255b7544ab290f70b4d6a1076ca06
21+
22+
COCOAPODS: 1.13.0

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 84 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1515
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1616
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
17+
E280FDB3836C27FE016D675C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F49031D57E53AEB5A9630D59 /* Pods_Runner.framework */; };
1718
/* End PBXBuildFile section */
1819

1920
/* Begin PBXCopyFilesBuildPhase section */
@@ -30,8 +31,10 @@
3031
/* End PBXCopyFilesBuildPhase section */
3132

3233
/* Begin PBXFileReference section */
34+
06351A3DAA8C2D8B04648B1A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3335
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3436
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
37+
29D780C836176C2061A66354 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3538
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3639
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3740
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -43,19 +46,41 @@
4346
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4447
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4548
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
49+
E2DBB38EB879BB0FF586BF7C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
50+
F49031D57E53AEB5A9630D59 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4651
/* End PBXFileReference section */
4752

4853
/* Begin PBXFrameworksBuildPhase section */
4954
97C146EB1CF9000F007C117D /* Frameworks */ = {
5055
isa = PBXFrameworksBuildPhase;
5156
buildActionMask = 2147483647;
5257
files = (
58+
E280FDB3836C27FE016D675C /* Pods_Runner.framework in Frameworks */,
5359
);
5460
runOnlyForDeploymentPostprocessing = 0;
5561
};
5662
/* End PBXFrameworksBuildPhase section */
5763

5864
/* Begin PBXGroup section */
65+
4963B74096EAE4B0A083CBD2 /* Frameworks */ = {
66+
isa = PBXGroup;
67+
children = (
68+
F49031D57E53AEB5A9630D59 /* Pods_Runner.framework */,
69+
);
70+
name = Frameworks;
71+
sourceTree = "<group>";
72+
};
73+
702CD734606E4B50AAC26D71 /* Pods */ = {
74+
isa = PBXGroup;
75+
children = (
76+
06351A3DAA8C2D8B04648B1A /* Pods-Runner.debug.xcconfig */,
77+
29D780C836176C2061A66354 /* Pods-Runner.release.xcconfig */,
78+
E2DBB38EB879BB0FF586BF7C /* Pods-Runner.profile.xcconfig */,
79+
);
80+
name = Pods;
81+
path = Pods;
82+
sourceTree = "<group>";
83+
};
5984
9740EEB11CF90186004384FC /* Flutter */ = {
6085
isa = PBXGroup;
6186
children = (
@@ -73,6 +98,8 @@
7398
9740EEB11CF90186004384FC /* Flutter */,
7499
97C146F01CF9000F007C117D /* Runner */,
75100
97C146EF1CF9000F007C117D /* Products */,
101+
702CD734606E4B50AAC26D71 /* Pods */,
102+
4963B74096EAE4B0A083CBD2 /* Frameworks */,
76103
);
77104
sourceTree = "<group>";
78105
};
@@ -114,12 +141,14 @@
114141
isa = PBXNativeTarget;
115142
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
116143
buildPhases = (
144+
0A4E3FF9447AF934BEEC3DA4 /* [CP] Check Pods Manifest.lock */,
117145
9740EEB61CF901F6004384FC /* Run Script */,
118146
97C146EA1CF9000F007C117D /* Sources */,
119147
97C146EB1CF9000F007C117D /* Frameworks */,
120148
97C146EC1CF9000F007C117D /* Resources */,
121149
9705A1C41CF9048500538489 /* Embed Frameworks */,
122150
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
151+
97AC9819616B6C43786E6122 /* [CP] Embed Pods Frameworks */,
123152
);
124153
buildRules = (
125154
);
@@ -179,6 +208,28 @@
179208
/* End PBXResourcesBuildPhase section */
180209

181210
/* Begin PBXShellScriptBuildPhase section */
211+
0A4E3FF9447AF934BEEC3DA4 /* [CP] Check Pods Manifest.lock */ = {
212+
isa = PBXShellScriptBuildPhase;
213+
buildActionMask = 2147483647;
214+
files = (
215+
);
216+
inputFileListPaths = (
217+
);
218+
inputPaths = (
219+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
220+
"${PODS_ROOT}/Manifest.lock",
221+
);
222+
name = "[CP] Check Pods Manifest.lock";
223+
outputFileListPaths = (
224+
);
225+
outputPaths = (
226+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
227+
);
228+
runOnlyForDeploymentPostprocessing = 0;
229+
shellPath = /bin/sh;
230+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
231+
showEnvVarsInLog = 0;
232+
};
182233
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
183234
isa = PBXShellScriptBuildPhase;
184235
alwaysOutOfDate = 1;
@@ -210,6 +261,24 @@
210261
shellPath = /bin/sh;
211262
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
212263
};
264+
97AC9819616B6C43786E6122 /* [CP] Embed Pods Frameworks */ = {
265+
isa = PBXShellScriptBuildPhase;
266+
buildActionMask = 2147483647;
267+
files = (
268+
);
269+
inputPaths = (
270+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
271+
"${BUILT_PRODUCTS_DIR}/rive_common/rive_common.framework",
272+
);
273+
name = "[CP] Embed Pods Frameworks";
274+
outputPaths = (
275+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/rive_common.framework",
276+
);
277+
runOnlyForDeploymentPostprocessing = 0;
278+
shellPath = /bin/sh;
279+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
280+
showEnvVarsInLog = 0;
281+
};
213282
/* End PBXShellScriptBuildPhase section */
214283

215284
/* Begin PBXSourcesBuildPhase section */
@@ -283,7 +352,7 @@
283352
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284353
GCC_WARN_UNUSED_FUNCTION = YES;
285354
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
355+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
287356
MTL_ENABLE_DEBUG_INFO = NO;
288357
SDKROOT = iphoneos;
289358
TARGETED_DEVICE_FAMILY = "1,2";
@@ -304,7 +373,10 @@
304373
"$(PROJECT_DIR)/Flutter",
305374
);
306375
INFOPLIST_FILE = Runner/Info.plist;
307-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
376+
LD_RUNPATH_SEARCH_PATHS = (
377+
"$(inherited)",
378+
"@executable_path/Frameworks",
379+
);
308380
LIBRARY_SEARCH_PATHS = (
309381
"$(inherited)",
310382
"$(PROJECT_DIR)/Flutter",
@@ -362,7 +434,7 @@
362434
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
363435
GCC_WARN_UNUSED_FUNCTION = YES;
364436
GCC_WARN_UNUSED_VARIABLE = YES;
365-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
437+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
366438
MTL_ENABLE_DEBUG_INFO = YES;
367439
ONLY_ACTIVE_ARCH = YES;
368440
SDKROOT = iphoneos;
@@ -409,7 +481,7 @@
409481
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
410482
GCC_WARN_UNUSED_FUNCTION = YES;
411483
GCC_WARN_UNUSED_VARIABLE = YES;
412-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
484+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
413485
MTL_ENABLE_DEBUG_INFO = NO;
414486
SDKROOT = iphoneos;
415487
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -431,7 +503,10 @@
431503
"$(PROJECT_DIR)/Flutter",
432504
);
433505
INFOPLIST_FILE = Runner/Info.plist;
434-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
506+
LD_RUNPATH_SEARCH_PATHS = (
507+
"$(inherited)",
508+
"@executable_path/Frameworks",
509+
);
435510
LIBRARY_SEARCH_PATHS = (
436511
"$(inherited)",
437512
"$(PROJECT_DIR)/Flutter",
@@ -459,7 +534,10 @@
459534
"$(PROJECT_DIR)/Flutter",
460535
);
461536
INFOPLIST_FILE = Runner/Info.plist;
462-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
537+
LD_RUNPATH_SEARCH_PATHS = (
538+
"$(inherited)",
539+
"@executable_path/Frameworks",
540+
);
463541
LIBRARY_SEARCH_PATHS = (
464542
"$(inherited)",
465543
"$(PROJECT_DIR)/Flutter",
@@ -497,7 +575,6 @@
497575
defaultConfigurationName = Release;
498576
};
499577
/* End XCConfigurationList section */
500-
501578
};
502579
rootObject = 97C146E61CF9000F007C117D /* Project object */;
503580
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
language = ""
3031
shouldUseLaunchSchemeArgsEnv = "YES">
3132
<Testables>
@@ -46,12 +47,14 @@
4647
buildConfiguration = "Debug"
4748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4951
language = ""
5052
launchStyle = "0"
5153
useCustomWorkingDirectory = "NO"
5254
ignoresPersistentStateOnLaunch = "NO"
5355
debugDocumentVersioning = "YES"
5456
debugServiceExtension = "internal"
57+
enableGPUValidationMode = "1"
5558
allowLocationSimulation = "YES">
5659
<BuildableProductRunnable
5760
runnableDebuggingMode = "0">

‎ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Runner/Info.plist‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@
4545
<true/>
4646
<key>UIApplicationSupportsIndirectInputEvents</key>
4747
<true/>
48+
<key>UIDesignRequiresCompatibility</key>
49+
<false/>
50+
4851
</dict>
4952
</plist>

0 commit comments

Comments
 (0)