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" : {
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
66
</dependencies>
77
<scenes>
88
<!--View Controller-->
99
<scene sceneID="EHf-IW-A2E">
1010
<objects>
1111
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
1212
<layoutGuides>
13-
<viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
14-
<viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
13+
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
14+
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1515
</layoutGuides>
1616
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
17+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
1718
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<subviews>
19-
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
20-
</imageView>
21-
</subviews>
22-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
23-
<constraints>
24-
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
25-
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
26-
</constraints>
19+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
2720
</view>
2821
</viewController>
2922
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
3023
</objects>
3124
<point key="canvasLocation" x="53" y="375"/>
3225
</scene>
3326
</scenes>
34-
<resources>
35-
<image name="LaunchImage" width="168" height="185"/>
36-
</resources>
3727
</document>

packages/shared_preferences/shared_preferences/example/ios/Runner/Info.plist

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,33 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
7-
<key>CFBundleDisplayName</key>
8-
<string>Example</string>
6+
<string>en</string>
97
<key>CFBundleExecutable</key>
108
<string>$(EXECUTABLE_NAME)</string>
119
<key>CFBundleIdentifier</key>
1210
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1311
<key>CFBundleInfoDictionaryVersion</key>
1412
<string>6.0</string>
1513
<key>CFBundleName</key>
16-
<string>example</string>
14+
<string>shared_preferences_example</string>
1715
<key>CFBundlePackageType</key>
1816
<string>APPL</string>
1917
<key>CFBundleShortVersionString</key>
20-
<string>$(FLUTTER_BUILD_NAME)</string>
18+
<string>1.0</string>
2119
<key>CFBundleSignature</key>
2220
<string>????</string>
2321
<key>CFBundleVersion</key>
24-
<string>$(FLUTTER_BUILD_NUMBER)</string>
22+
<string>1</string>
2523
<key>LSRequiresIPhoneOS</key>
2624
<true/>
2725
<key>UILaunchStoryboardName</key>
2826
<string>LaunchScreen</string>
2927
<key>UIMainStoryboardFile</key>
3028
<string>Main</string>
29+
<key>UIRequiredDeviceCapabilities</key>
30+
<array>
31+
<string>arm64</string>
32+
</array>
3133
<key>UISupportedInterfaceOrientations</key>
3234
<array>
3335
<string>UIInterfaceOrientationPortrait</string>
@@ -43,9 +45,5 @@
4345
</array>
4446
<key>UIViewControllerBasedStatusBarAppearance</key>
4547
<false/>
46-
<key>CADisableMinimumFrameDurationOnPhone</key>
47-
<true/>
48-
<key>UIApplicationSupportsIndirectInputEvents</key>
49-
<true/>
5048
</dict>
5149
</plist>

packages/shared_preferences/shared_preferences_foundation/example/ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ 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+
3134
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3235
target 'RunnerTests' do
3336
inherit! :search_paths

0 commit comments

Comments
 (0)