Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit f80aabf

Browse files
[shared_preferences] Revert recent iOS example changes (#6955)
* Revert "[shared_preferences_foundation] Add Swift runtime search paths for Objective-C apps (#6952)" This reverts commit be2e3de. * Revert "[shared_preferences] Switch to `shared_preferences_foundation` (#6940)" This reverts commit 44098fe. * Re-apply the non-example parts of the reverted PRs
1 parent e2d174c commit f80aabf

File tree

18 files changed

+197
-249
lines changed

18 files changed

+197
-249
lines changed

packages/shared_preferences/shared_preferences/example/ios/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
**/dgph
21
*.mode1v3
32
*.mode2v3
43
*.moved-aside
@@ -19,7 +18,6 @@ Flutter/App.framework
1918
Flutter/Flutter.framework
2019
Flutter/Flutter.podspec
2120
Flutter/Generated.xcconfig
22-
Flutter/ephemeral/
2321
Flutter/app.flx
2422
Flutter/app.zip
2523
Flutter/flutter_assets/

packages/shared_preferences/shared_preferences/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
23+
<key>UIRequiredDeviceCapabilities</key>
24+
<array>
25+
<string>arm64</string>
26+
</array>
2327
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
28+
<string>9.0</string>
2529
</dict>
2630
</plist>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
22
#include "Generated.xcconfig"
3+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
22
#include "Generated.xcconfig"
3+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"

packages/shared_preferences/shared_preferences/example/ios/Podfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '9.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -28,9 +28,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
2828
flutter_ios_podfile_setup
2929

3030
target 'Runner' do
31-
use_frameworks!
32-
use_modular_headers!
33-
3431
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3532
end
3633

packages/shared_preferences/shared_preferences/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 85 additions & 168 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 2 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 = "1300"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,6 +37,16 @@
3737
</BuildableReference>
3838
</MacroExpansion>
3939
<Testables>
40+
<TestableReference
41+
skipped = "NO">
42+
<BuildableReference
43+
BuildableIdentifier = "primary"
44+
BlueprintIdentifier = "F76AC2052669B6AE0040C8BC"
45+
BuildableName = "RunnerTests.xctest"
46+
BlueprintName = "RunnerTests"
47+
ReferencedContainer = "container:Runner.xcodeproj">
48+
</BuildableReference>
49+
</TestableReference>
4050
</Testables>
4151
</TestAction>
4252
<LaunchAction
@@ -61,7 +71,7 @@
6171
</BuildableProductRunnable>
6272
</LaunchAction>
6373
<ProfileAction
64-
buildConfiguration = "Profile"
74+
buildConfiguration = "Release"
6575
shouldUseLaunchSchemeArgsEnv = "YES"
6676
savedToolIdentifier = ""
6777
useCustomWorkingDirectory = "NO"

packages/shared_preferences/shared_preferences/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
"idiom" : "ipad",
108108
"filename" : "[email protected]",
109109
"scale" : "2x"
110-
},
111-
{
112-
"size" : "1024x1024",
113-
"idiom" : "ios-marketing",
114-
"filename" : "[email protected]",
115-
"scale" : "1x"
116110
}
117111
],
118112
"info" : {

0 commit comments

Comments
 (0)