diff --git a/CODEOWNERS b/CODEOWNERS index c93c45c9c6b1..39f3be931cfa 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -51,7 +51,7 @@ packages/ios_platform_images/ios/** @jmagman packages/local_auth/local_auth_ios/** @hellohuanlin packages/path_provider/path_provider_ios/** @jmagman packages/quick_actions/quick_actions_ios/** @hellohuanlin -packages/shared_preferences/shared_preferences_ios/** @cyanglaz +packages/shared_preferences/shared_preferences_foundation/** @cyanglaz packages/url_launcher/url_launcher_ios/** @jmagman packages/video_player/video_player_avfoundation/** @hellohuanlin packages/webview_flutter/webview_flutter_wkwebview/** @cyanglaz @@ -65,7 +65,6 @@ packages/url_launcher/url_launcher_linux/** @cbracken # - macOS packages/file_selector/file_selector_macos/** @cbracken packages/path_provider/path_provider_macos/** @cbracken -packages/shared_preferences/shared_preferences_macos/** @cbracken packages/url_launcher/url_launcher_macos/** @cbracken # - Windows diff --git a/packages/shared_preferences/shared_preferences_ios/AUTHORS b/packages/shared_preferences/shared_preferences_foundation/AUTHORS similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/AUTHORS rename to packages/shared_preferences/shared_preferences_foundation/AUTHORS diff --git a/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md b/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md new file mode 100644 index 000000000000..e2771cca480c --- /dev/null +++ b/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md @@ -0,0 +1,5 @@ +## 2.1.0 + +* Renames the package previously published as + [`shared_preferences_macos`](https://pub.dev/packages/shared_preferences_macos) +* Adds iOS support. diff --git a/packages/shared_preferences/shared_preferences_ios/LICENSE b/packages/shared_preferences/shared_preferences_foundation/LICENSE similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/LICENSE rename to packages/shared_preferences/shared_preferences_foundation/LICENSE diff --git a/packages/shared_preferences/shared_preferences_ios/README.md b/packages/shared_preferences/shared_preferences_foundation/README.md similarity index 77% rename from packages/shared_preferences/shared_preferences_ios/README.md rename to packages/shared_preferences/shared_preferences_foundation/README.md index 5c9ced3b2096..1aaa9253399b 100644 --- a/packages/shared_preferences/shared_preferences_ios/README.md +++ b/packages/shared_preferences/shared_preferences_foundation/README.md @@ -1,6 +1,6 @@ -# shared\_preferences\_ios +# shared\_preferences\_foundation -The iOS implementation of [`shared_preferences`][1]. +The iOS and macOS implementation of [`shared_preferences`][1]. ## Usage diff --git a/packages/shared_preferences/shared_preferences_macos/macos/Classes/SharedPreferencesPlugin.swift b/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/SharedPreferencesPlugin.swift similarity index 82% rename from packages/shared_preferences/shared_preferences_macos/macos/Classes/SharedPreferencesPlugin.swift rename to packages/shared_preferences/shared_preferences_foundation/darwin/Classes/SharedPreferencesPlugin.swift index 6e5e79d53a35..c97698ce0f7c 100644 --- a/packages/shared_preferences/shared_preferences_macos/macos/Classes/SharedPreferencesPlugin.swift +++ b/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/SharedPreferencesPlugin.swift @@ -2,13 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import FlutterMacOS import Foundation +#if os(iOS) +import Flutter +#elseif os(macOS) +import FlutterMacOS +#endif + public class SharedPreferencesPlugin: NSObject, FlutterPlugin, UserDefaultsApi { public static func register(with registrar: FlutterPluginRegistrar) { let instance = SharedPreferencesPlugin() - UserDefaultsApiSetup.setUp(binaryMessenger: registrar.messenger, api: instance) + // Workaround for https://github.com/flutter/flutter/issues/118103. +#if os(iOS) + let messenger = registrar.messenger() +#else + let messenger = registrar.messenger +#endif + UserDefaultsApiSetup.setUp(binaryMessenger: messenger, api: instance) } func getAll() -> [String? : Any?] { diff --git a/packages/shared_preferences/shared_preferences_macos/macos/Classes/messages.g.swift b/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift similarity index 100% rename from packages/shared_preferences/shared_preferences_macos/macos/Classes/messages.g.swift rename to packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/RunnerTests.swift b/packages/shared_preferences/shared_preferences_foundation/darwin/Tests/RunnerTests.swift similarity index 95% rename from packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/RunnerTests.swift rename to packages/shared_preferences/shared_preferences_foundation/darwin/Tests/RunnerTests.swift index 9a1b2f0e717f..a4dd4b58f923 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/RunnerTests.swift +++ b/packages/shared_preferences/shared_preferences_foundation/darwin/Tests/RunnerTests.swift @@ -2,9 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import FlutterMacOS import XCTest -@testable import shared_preferences_macos + +#if os(iOS) +import Flutter +#elseif os(macOS) +import FlutterMacOS +#endif + +@testable import shared_preferences_foundation class RunnerTests: XCTestCase { func testSetAndGet() throws { diff --git a/packages/shared_preferences/shared_preferences_macos/macos/shared_preferences_macos.podspec b/packages/shared_preferences/shared_preferences_foundation/darwin/shared_preferences_foundation.podspec similarity index 61% rename from packages/shared_preferences/shared_preferences_macos/macos/shared_preferences_macos.podspec rename to packages/shared_preferences/shared_preferences_foundation/darwin/shared_preferences_foundation.podspec index 590b0c34adcf..6104dd329966 100644 --- a/packages/shared_preferences/shared_preferences_macos/macos/shared_preferences_macos.podspec +++ b/packages/shared_preferences/shared_preferences_foundation/darwin/shared_preferences_foundation.podspec @@ -2,22 +2,22 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'shared_preferences_macos' + s.name = 'shared_preferences_foundation' s.version = '0.0.1' - s.summary = 'macOS implementation of the shared_preferences plugin.' + s.summary = 'iOS and macOS implementation of the shared_preferences plugin.' s.description = <<-DESC Wraps NSUserDefaults, providing a persistent store for simple key-value pairs. DESC - s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_macos' + s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_foundation' s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_macos' } + s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_foundation' } s.source_files = 'Classes/**/*' - s.dependency 'FlutterMacOS' - - s.platform = :osx, '10.11' + s.ios.dependency 'Flutter' + s.osx.dependency 'FlutterMacOS' + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.11' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' end - diff --git a/packages/shared_preferences/shared_preferences_ios/example/.gitignore b/packages/shared_preferences/shared_preferences_foundation/example/.gitignore similarity index 92% rename from packages/shared_preferences/shared_preferences_ios/example/.gitignore rename to packages/shared_preferences/shared_preferences_foundation/example/.gitignore index 0fa6b675c0a5..24476c5d1eb5 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/.gitignore +++ b/packages/shared_preferences/shared_preferences_foundation/example/.gitignore @@ -8,6 +8,7 @@ .buildlog/ .history .svn/ +migrate_working_dir/ # IntelliJ related *.iml @@ -31,9 +32,6 @@ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols diff --git a/packages/shared_preferences/shared_preferences_ios/example/README.md b/packages/shared_preferences/shared_preferences_foundation/example/README.md similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/README.md rename to packages/shared_preferences/shared_preferences_foundation/example/README.md diff --git a/packages/shared_preferences/shared_preferences_ios/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_foundation/example/integration_test/shared_preferences_test.dart similarity index 98% rename from packages/shared_preferences/shared_preferences_ios/example/integration_test/shared_preferences_test.dart rename to packages/shared_preferences/shared_preferences_foundation/example/integration_test/shared_preferences_test.dart index b4b21871701c..b3c1973c2cd5 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_foundation/example/integration_test/shared_preferences_test.dart @@ -9,7 +9,7 @@ import 'package:shared_preferences_platform_interface/shared_preferences_platfor void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - group('SharedPreferencesIos', () { + group('SharedPreferencesFoundation', () { const Map kTestValues = { 'flutter.String': 'hello world', 'flutter.bool': true, diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/.gitignore b/packages/shared_preferences/shared_preferences_foundation/example/ios/.gitignore similarity index 95% rename from packages/shared_preferences/shared_preferences_ios/example/ios/.gitignore rename to packages/shared_preferences/shared_preferences_foundation/example/ios/.gitignore index e96ef602b8d1..7a7f9873ad7d 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/.gitignore +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/.gitignore @@ -1,3 +1,4 @@ +**/dgph *.mode1v3 *.mode2v3 *.moved-aside @@ -18,6 +19,7 @@ Flutter/App.framework Flutter/Flutter.framework Flutter/Flutter.podspec Flutter/Generated.xcconfig +Flutter/ephemeral/ Flutter/app.flx Flutter/app.zip Flutter/flutter_assets/ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/AppFrameworkInfo.plist b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/AppFrameworkInfo.plist similarity index 86% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/AppFrameworkInfo.plist rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/AppFrameworkInfo.plist index 3a9c234f96d4..9625e105df39 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/AppFrameworkInfo.plist @@ -20,11 +20,7 @@ ???? CFBundleVersion 1.0 - UIRequiredDeviceCapabilities - - arm64 - MinimumOSVersion - 9.0 + 11.0 diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Debug.xcconfig b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Debug.xcconfig similarity index 58% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Debug.xcconfig rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Debug.xcconfig index d0eccdcaf401..ec97fc6f3021 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Debug.xcconfig +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Debug.xcconfig @@ -1,3 +1,2 @@ #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Release.xcconfig b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Release.xcconfig similarity index 58% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Release.xcconfig rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Release.xcconfig index c751c1d022fa..c4855bfe2000 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Release.xcconfig +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/Release.xcconfig @@ -1,3 +1,2 @@ #include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Podfile b/packages/shared_preferences/shared_preferences_foundation/example/ios/Podfile similarity index 95% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Podfile rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Podfile index 3924e59aa0f9..fdcc671eb341 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Podfile +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -28,6 +28,9 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup target 'Runner' do + use_frameworks! + use_modular_headers! + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do inherit! :search_paths diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj similarity index 59% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.pbxproj rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj index c7567b312596..920741d8f335 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,24 +3,23 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 2D92224B1EC342E7007564B0 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D92224A1EC342E7007564B0 /* GeneratedPluginRegistrant.m */; }; + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 4E8BDD90E81668641A750C18 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 556D8EFC85341B7D1FDF536D /* libPods-RunnerTests.a */; }; - 66F8BCECCEFF62F4071D2DFC /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 12E03CD14DABAA3AD3923183 /* libPods-Runner.a */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - F76AC2092669B6AE0040C8BC /* SharedPreferencesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC2082669B6AE0040C8BC /* SharedPreferencesTests.m */; }; + 9AF3A5CAB88B27F2BC36D686 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4C443E7E16FB2AD978AC1D6 /* Pods_RunnerTests.framework */; }; + B81650923B266CE1F32B75E4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3702C135032CE4599D8327B /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - F76AC20B2669B6AE0040C8BC /* PBXContainerItemProxy */ = { + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 97C146E61CF9000F007C117D /* Project object */; proxyType = 1; @@ -43,60 +42,66 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 081A3238A89B77A99B096D83 /* 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 = ""; }; - 12E03CD14DABAA3AD3923183 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D9222491EC342E7007564B0 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 2D92224A1EC342E7007564B0 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ../../../darwin/Tests/RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3A8F2565F3AF472E2E0A219E /* 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 = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 556D8EFC85341B7D1FDF536D /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6F1615DD96BB2B955423149B /* 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 = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 942E815CEF30E101E045B849 /* 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 = ""; }; + 87C77C652D5BC0B23F81E01F /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A2FC4F1DC78D7C01312F877F /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - D896CE48B6CC2EB7D42CB6B6 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; - F76AC2062669B6AE0040C8BC /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - F76AC2082669B6AE0040C8BC /* SharedPreferencesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SharedPreferencesTests.m; sourceTree = ""; }; - F76AC20A2669B6AE0040C8BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B5E9D2BAFD0E9BF6494E5389 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + D4C443E7E16FB2AD978AC1D6 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D9DC9227831D288079E5C887 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + F1B6CB00204D3430428972D5 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + F3702C135032CE4599D8327B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 3F94D8484CE6A0609BCE7680 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 66F8BCECCEFF62F4071D2DFC /* libPods-Runner.a in Frameworks */, + 9AF3A5CAB88B27F2BC36D686 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F76AC2032669B6AE0040C8BC /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4E8BDD90E81668641A750C18 /* libPods-RunnerTests.a in Frameworks */, + B81650923B266CE1F32B75E4 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 840012C8B5EDBCF56B0E4AC1 /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - 942E815CEF30E101E045B849 /* Pods-Runner.debug.xcconfig */, - 081A3238A89B77A99B096D83 /* Pods-Runner.release.xcconfig */, - A2FC4F1DC78D7C01312F877F /* Pods-RunnerTests.debug.xcconfig */, - D896CE48B6CC2EB7D42CB6B6 /* Pods-RunnerTests.release.xcconfig */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Pods; + path = RunnerTests; + sourceTree = ""; + }; + 4E1DD4374F34EBDF7F4214F0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + F3702C135032CE4599D8327B /* Pods_Runner.framework */, + D4C443E7E16FB2AD978AC1D6 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -115,10 +120,10 @@ children = ( 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, - F76AC2072669B6AE0040C8BC /* RunnerTests */, 97C146EF1CF9000F007C117D /* Products */, - 840012C8B5EDBCF56B0E4AC1 /* Pods */, - CF3B75C9A7D2FA2A4C99F110 /* Frameworks */, + 331C8082294A63A400263BE5 /* RunnerTests */, + DA43E4FDD6392A0D5FBF1611 /* Pods */, + 4E1DD4374F34EBDF7F4214F0 /* Frameworks */, ); sourceTree = ""; }; @@ -126,7 +131,7 @@ isa = PBXGroup; children = ( 97C146EE1CF9000F007C117D /* Runner.app */, - F76AC2062669B6AE0040C8BC /* RunnerTests.xctest */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, ); name = Products; sourceTree = ""; @@ -134,59 +139,66 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 2D9222491EC342E7007564B0 /* GeneratedPluginRegistrant.h */, - 2D92224A1EC342E7007564B0 /* GeneratedPluginRegistrant.m */, - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = { + DA43E4FDD6392A0D5FBF1611 /* Pods */ = { isa = PBXGroup; children = ( - 12E03CD14DABAA3AD3923183 /* libPods-Runner.a */, - 556D8EFC85341B7D1FDF536D /* libPods-RunnerTests.a */, + 3A8F2565F3AF472E2E0A219E /* Pods-Runner.debug.xcconfig */, + 87C77C652D5BC0B23F81E01F /* Pods-Runner.release.xcconfig */, + 6F1615DD96BB2B955423149B /* Pods-Runner.profile.xcconfig */, + F1B6CB00204D3430428972D5 /* Pods-RunnerTests.debug.xcconfig */, + D9DC9227831D288079E5C887 /* Pods-RunnerTests.release.xcconfig */, + B5E9D2BAFD0E9BF6494E5389 /* Pods-RunnerTests.profile.xcconfig */, ); - name = Frameworks; - sourceTree = ""; - }; - F76AC2072669B6AE0040C8BC /* RunnerTests */ = { - isa = PBXGroup; - children = ( - F76AC2082669B6AE0040C8BC /* SharedPreferencesTests.m */, - F76AC20A2669B6AE0040C8BC /* Info.plist */, - ); - path = RunnerTests; + name = Pods; + path = Pods; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 9DEF57700431B717ADF93FFA /* [CP] Check Pods Manifest.lock */, + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + 3F94D8484CE6A0609BCE7680 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 97C146ED1CF9000F007C117D /* Runner */ = { isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - AB1344B0443C71CD721E1BB7 /* [CP] Check Pods Manifest.lock */, + 4B0B07E2CB0088D1DE03E09A /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 3AC0A86331B4FD70A0EF91D9 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -197,46 +209,27 @@ productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; }; - F76AC2052669B6AE0040C8BC /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = F76AC20F2669B6AE0040C8BC /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - DB9B98025BDEFED85B1B62A7 /* [CP] Check Pods Manifest.lock */, - F76AC2022669B6AE0040C8BC /* Sources */, - F76AC2032669B6AE0040C8BC /* Frameworks */, - F76AC2042669B6AE0040C8BC /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - F76AC20C2669B6AE0040C8BC /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = F76AC2062669B6AE0040C8BC /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; - ORGANIZATIONNAME = "The Flutter Authors"; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - }; - F76AC2052669B6AE0040C8BC = { - CreatedOnToolsVersion = 12.5; - ProvisioningStyle = Automatic; - TestTargetID = 97C146ED1CF9000F007C117D; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -249,71 +242,79 @@ projectRoot = ""; targets = ( 97C146ED1CF9000F007C117D /* Runner */, - F76AC2052669B6AE0040C8BC /* RunnerTests */, + 331C8080294A63A400263BE5 /* RunnerTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 97C146EC1CF9000F007C117D /* Resources */ = { + 331C807F294A63A400263BE5 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - F76AC2042669B6AE0040C8BC /* Resources */ = { + 97C146EC1CF9000F007C117D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 3AC0A86331B4FD70A0EF91D9 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputPaths = ( + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "Thin Binary"; - outputPaths = ( + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Run Script"; + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - AB1344B0443C71CD721E1BB7 /* [CP] Check Pods Manifest.lock */ = { + 4B0B07E2CB0088D1DE03E09A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); outputPaths = ( "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); @@ -322,7 +323,22 @@ 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"; showEnvVarsInLog = 0; }; - DB9B98025BDEFED85B1B62A7 /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + 9DEF57700431B717ADF93FFA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -347,31 +363,30 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 97C146EA1CF9000F007C117D /* Sources */ = { + 331C807D294A63A400263BE5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, - 2D92224B1EC342E7007564B0 /* GeneratedPluginRegistrant.m in Sources */, + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - F76AC2022669B6AE0040C8BC /* Sources */ = { + 97C146EA1CF9000F007C117D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F76AC2092669B6AE0040C8BC /* SharedPreferencesTests.m in Sources */, + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - F76AC20C2669B6AE0040C8BC /* PBXTargetDependency */ = { + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 97C146ED1CF9000F007C117D /* Runner */; - targetProxy = F76AC20B2669B6AE0040C8BC /* PBXContainerItemProxy */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -395,11 +410,131 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F1B6CB00204D3430428972D5 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D9DC9227831D288079E5C887 /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B5E9D2BAFD0E9BF6494E5389 /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -443,7 +578,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -455,7 +590,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -493,9 +627,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -506,19 +643,20 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.sharedPreferencesExample; + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; @@ -527,76 +665,51 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Flutter", + "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.sharedPreferencesExample; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - F76AC20D2669B6AE0040C8BC /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = A2FC4F1DC78D7C01312F877F /* Pods-RunnerTests.debug.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = RunnerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner"; - }; - name = Debug; - }; - F76AC20E2669B6AE0040C8BC /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D896CE48B6CC2EB7D42CB6B6 /* Pods-RunnerTests.release.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = RunnerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F76AC20F2669B6AE0040C8BC /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { isa = XCConfigurationList; buildConfigurations = ( - F76AC20D2669B6AE0040C8BC /* Debug */, - F76AC20E2669B6AE0040C8BC /* Release */, + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 94% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5e29b432c48c..e42adcb34c2d 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + skipped = "NO" + parallelizable = "YES"> @@ -71,7 +72,7 @@ - + - + @@ -10,13 +10,20 @@ - - + + - - + + + + + + + + + @@ -24,4 +31,7 @@ + + + diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Base.lproj/Main.storyboard b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Base.lproj/Main.storyboard rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Info.plist b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Info.plist similarity index 78% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Info.plist rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Info.plist index 22fc4c23715d..30d5f4b0e845 100644 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Info.plist +++ b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Info.plist @@ -3,7 +3,9 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Shared Preferences Foundation CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -11,25 +13,21 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - shared_preferences_example + shared_preferences_foundation_example CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + $(FLUTTER_BUILD_NAME) CFBundleSignature ???? CFBundleVersion - 1 + $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS UILaunchStoryboardName LaunchScreen UIMainStoryboardFile Main - UIRequiredDeviceCapabilities - - arm64 - UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -45,5 +43,9 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Runner-Bridging-Header.h b/packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Runner-Bridging-Header.h rename to packages/shared_preferences/shared_preferences_foundation/example/ios/Runner/Runner-Bridging-Header.h diff --git a/packages/shared_preferences/shared_preferences_macos/example/lib/main.dart b/packages/shared_preferences/shared_preferences_foundation/example/lib/main.dart similarity index 100% rename from packages/shared_preferences/shared_preferences_macos/example/lib/main.dart rename to packages/shared_preferences/shared_preferences_foundation/example/lib/main.dart diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/shared_preferences/shared_preferences_foundation/example/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from packages/shared_preferences/shared_preferences_macos/example/macos/Flutter/Flutter-Debug.xcconfig rename to packages/shared_preferences/shared_preferences_foundation/example/macos/Flutter/Flutter-Debug.xcconfig diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/Flutter/Flutter-Release.xcconfig b/packages/shared_preferences/shared_preferences_foundation/example/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from packages/shared_preferences/shared_preferences_macos/example/macos/Flutter/Flutter-Release.xcconfig rename to packages/shared_preferences/shared_preferences_foundation/example/macos/Flutter/Flutter-Release.xcconfig diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/Podfile b/packages/shared_preferences/shared_preferences_foundation/example/macos/Podfile similarity index 100% rename from packages/shared_preferences/shared_preferences_macos/example/macos/Podfile rename to packages/shared_preferences/shared_preferences_foundation/example/macos/Podfile diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/project.pbxproj b/packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj similarity index 99% rename from packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/project.pbxproj rename to packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj index 96f46f062f91..0bfa5f0a93d7 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -78,7 +78,7 @@ 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; 33EBD39826727BD10013E557 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 33EBD39A26727BD10013E557 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 33EBD39A26727BD10013E557 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ../../../darwin/Tests/RunnerTests.swift; sourceTree = ""; }; 33EBD39C26727BD10013E557 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5067D74CB28D28AE3B3DD05B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 53F020549CA1E801ACA3428F /* 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 = ""; }; @@ -260,7 +260,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -347,6 +347,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -389,11 +390,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/shared_preferences_macos/shared_preferences_macos.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_macos.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 99% rename from packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 208a9bafa77a..6700d7ba4c05 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/shared_preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Function(String key, Object value); -/// macOS implementation of shared_preferences. -class SharedPreferencesMacOS extends SharedPreferencesStorePlatform { +/// iOS and macOS implementation of shared_preferences. +class SharedPreferencesFoundation extends SharedPreferencesStorePlatform { final UserDefaultsApi _api = UserDefaultsApi(); late final Map _setters = { 'Bool': (String key, Object value) { @@ -32,7 +32,7 @@ class SharedPreferencesMacOS extends SharedPreferencesStorePlatform { /// Registers this class as the default instance of /// [SharedPreferencesStorePlatform]. static void registerWith() { - SharedPreferencesStorePlatform.instance = SharedPreferencesMacOS(); + SharedPreferencesStorePlatform.instance = SharedPreferencesFoundation(); } @override diff --git a/packages/shared_preferences/shared_preferences_foundation/macos/Classes/SharedPreferencesPlugin.swift b/packages/shared_preferences/shared_preferences_foundation/macos/Classes/SharedPreferencesPlugin.swift new file mode 120000 index 000000000000..7b5941d0dc67 --- /dev/null +++ b/packages/shared_preferences/shared_preferences_foundation/macos/Classes/SharedPreferencesPlugin.swift @@ -0,0 +1 @@ +../../darwin/Classes/SharedPreferencesPlugin.swift \ No newline at end of file diff --git a/packages/shared_preferences/shared_preferences_foundation/macos/Classes/messages.g.swift b/packages/shared_preferences/shared_preferences_foundation/macos/Classes/messages.g.swift new file mode 120000 index 000000000000..11bcf06e96a8 --- /dev/null +++ b/packages/shared_preferences/shared_preferences_foundation/macos/Classes/messages.g.swift @@ -0,0 +1 @@ +../../darwin/Classes/messages.g.swift \ No newline at end of file diff --git a/packages/shared_preferences/shared_preferences_foundation/macos/README.md b/packages/shared_preferences/shared_preferences_foundation/macos/README.md new file mode 100644 index 000000000000..fd7261950f35 --- /dev/null +++ b/packages/shared_preferences/shared_preferences_foundation/macos/README.md @@ -0,0 +1,4 @@ +This only contains symlinks to ../darwin, to support versions of Flutter +prior that don't include https://github.com/flutter/flutter/pull/115337. +Once the minimum Flutter version supported by this implementation is one that +includes that functionality, this directory should be removed. diff --git a/packages/shared_preferences/shared_preferences_foundation/macos/shared_preferences_foundation.podspec b/packages/shared_preferences/shared_preferences_foundation/macos/shared_preferences_foundation.podspec new file mode 120000 index 000000000000..59dcc19e0bf9 --- /dev/null +++ b/packages/shared_preferences/shared_preferences_foundation/macos/shared_preferences_foundation.podspec @@ -0,0 +1 @@ +../darwin/shared_preferences_foundation.podspec \ No newline at end of file diff --git a/packages/shared_preferences/shared_preferences_ios/pigeons/copyright_header.txt b/packages/shared_preferences/shared_preferences_foundation/pigeons/copyright_header.txt similarity index 100% rename from packages/shared_preferences/shared_preferences_ios/pigeons/copyright_header.txt rename to packages/shared_preferences/shared_preferences_foundation/pigeons/copyright_header.txt diff --git a/packages/shared_preferences/shared_preferences_macos/pigeons/messages.dart b/packages/shared_preferences/shared_preferences_foundation/pigeons/messages.dart similarity index 95% rename from packages/shared_preferences/shared_preferences_macos/pigeons/messages.dart rename to packages/shared_preferences/shared_preferences_foundation/pigeons/messages.dart index bda7185fefb5..81848ed53279 100644 --- a/packages/shared_preferences/shared_preferences_macos/pigeons/messages.dart +++ b/packages/shared_preferences/shared_preferences_foundation/pigeons/messages.dart @@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/messages.g.dart', dartTestOut: 'test/test_api.g.dart', - swiftOut: 'macos/Classes/messages.g.swift', + swiftOut: 'darwin/Classes/messages.g.swift', copyrightHeader: 'pigeons/copyright_header.txt', )) @HostApi(dartHostTestHandler: 'TestUserDefaultsApi') diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml similarity index 53% rename from packages/shared_preferences/shared_preferences_macos/pubspec.yaml rename to packages/shared_preferences/shared_preferences_foundation/pubspec.yaml index 2ddf99816d2f..f0397d0bf9e3 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml @@ -1,8 +1,8 @@ -name: shared_preferences_macos -description: macOS implementation of the shared_preferences plugin. -repository: https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_macos +name: shared_preferences_foundation +description: iOS and macOS implementation of the shared_preferences plugin. +repository: https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_foundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.0.5 +version: 2.1.0 environment: sdk: ">=2.12.0 <3.0.0" @@ -12,9 +12,14 @@ flutter: plugin: implements: shared_preferences platforms: + # TODO(stuartmorgan): Add sharedDarwinSource to these once + # https://github.com/flutter/flutter/pull/115337 lands. + ios: + pluginClass: SharedPreferencesPlugin + dartPluginClass: SharedPreferencesFoundation macos: pluginClass: SharedPreferencesPlugin - dartPluginClass: SharedPreferencesMacOS + dartPluginClass: SharedPreferencesFoundation dependencies: flutter: diff --git a/packages/shared_preferences/shared_preferences_macos/test/shared_preferences_macos_test.dart b/packages/shared_preferences/shared_preferences_foundation/test/shared_preferences_foundation_test.dart similarity index 83% rename from packages/shared_preferences/shared_preferences_macos/test/shared_preferences_macos_test.dart rename to packages/shared_preferences/shared_preferences_foundation/test/shared_preferences_foundation_test.dart index f32ba4c77915..6c0635a3342f 100644 --- a/packages/shared_preferences/shared_preferences_macos/test/shared_preferences_macos_test.dart +++ b/packages/shared_preferences/shared_preferences_foundation/test/shared_preferences_foundation_test.dart @@ -4,7 +4,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:shared_preferences_macos/shared_preferences_macos.dart'; +import 'package:shared_preferences_foundation/shared_preferences_foundation.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; import 'test_api.g.dart'; @@ -53,27 +53,27 @@ void main() { }); test('registerWith', () { - SharedPreferencesMacOS.registerWith(); - expect( - SharedPreferencesStorePlatform.instance, isA()); + SharedPreferencesFoundation.registerWith(); + expect(SharedPreferencesStorePlatform.instance, + isA()); }); test('remove', () async { - final SharedPreferencesMacOS plugin = SharedPreferencesMacOS(); + final SharedPreferencesFoundation plugin = SharedPreferencesFoundation(); api.items['flutter.hi'] = 'world'; expect(await plugin.remove('flutter.hi'), isTrue); expect(api.items.containsKey('flutter.hi'), isFalse); }); test('clear', () async { - final SharedPreferencesMacOS plugin = SharedPreferencesMacOS(); + final SharedPreferencesFoundation plugin = SharedPreferencesFoundation(); api.items['flutter.hi'] = 'world'; expect(await plugin.clear(), isTrue); expect(api.items.containsKey('flutter.hi'), isFalse); }); test('getAll', () async { - final SharedPreferencesMacOS plugin = SharedPreferencesMacOS(); + final SharedPreferencesFoundation plugin = SharedPreferencesFoundation(); api.items['flutter.aBool'] = true; api.items['flutter.aDouble'] = 3.14; api.items['flutter.anInt'] = 42; @@ -90,7 +90,7 @@ void main() { }); test('setValue', () async { - final SharedPreferencesMacOS plugin = SharedPreferencesMacOS(); + final SharedPreferencesFoundation plugin = SharedPreferencesFoundation(); expect(await plugin.setValue('Bool', 'flutter.Bool', true), isTrue); expect(api.items['flutter.Bool'], true); expect(await plugin.setValue('Double', 'flutter.Double', 1.5), isTrue); @@ -107,7 +107,7 @@ void main() { }); test('setValue with unsupported type', () { - final SharedPreferencesMacOS plugin = SharedPreferencesMacOS(); + final SharedPreferencesFoundation plugin = SharedPreferencesFoundation(); expect(() async { await plugin.setValue('Map', 'flutter.key', {}); }, throwsA(isA())); diff --git a/packages/shared_preferences/shared_preferences_macos/test/test_api.g.dart b/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart similarity index 98% rename from packages/shared_preferences/shared_preferences_macos/test/test_api.g.dart rename to packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart index baa67374932f..12f97bd2b794 100644 --- a/packages/shared_preferences/shared_preferences_macos/test/test_api.g.dart +++ b/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart @@ -11,7 +11,7 @@ import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:shared_preferences_macos/messages.g.dart'; +import 'package:shared_preferences_foundation/messages.g.dart'; abstract class TestUserDefaultsApi { static const MessageCodec codec = StandardMessageCodec(); diff --git a/packages/shared_preferences/shared_preferences_ios/CHANGELOG.md b/packages/shared_preferences/shared_preferences_ios/CHANGELOG.md deleted file mode 100644 index d2101e0784cf..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/CHANGELOG.md +++ /dev/null @@ -1,25 +0,0 @@ -## NEXT - -* Updates code for `no_leading_underscores_for_local_identifiers` lint. -* Updates minimum Flutter version to 2.10. - -## 2.1.1 - -* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors - lint warnings. - -## 2.1.0 - -* Upgrades to using Pigeon. - -## 2.0.10 - -* Switches to an in-package method channel implementation. - -## 2.0.9 - -* Removes dependency on `meta`. - -## 2.0.8 - -* Split from `shared_preferences` as a federated implementation. diff --git a/packages/shared_preferences/shared_preferences_ios/example/.metadata b/packages/shared_preferences/shared_preferences_ios/example/.metadata deleted file mode 100644 index e0e9530fccc9..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: 79b49b9e1057f90ebf797725233c6b311722de69 - channel: dev - -project_type: app diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.h b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.h deleted file mode 100644 index 0681d288bb70..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.m b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.m deleted file mode 100644 index b790a0a52635..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "AppDelegate.h" -#include "GeneratedPluginRegistrant.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GeneratedPluginRegistrant registerWithRegistry:self]; - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 28c6bf03016f..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 2ccbfd967d96..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b0bca8..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cde12118dda..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e7edb8..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index dcdc2306c285..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 2ccbfd967d96..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8f5cee..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b8609df0..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b8609df0..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d164a5a9..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d39da7..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 6a84f41e14e2..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index d0e1f5853602..000000000000 Binary files a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/main.m b/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/main.m deleted file mode 100644 index f143297b30d6..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/Runner/main.m +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import -#import -#import "AppDelegate.h" - -int main(int argc, char *argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/example/ios/RunnerTests/SharedPreferencesTests.m b/packages/shared_preferences/shared_preferences_ios/example/ios/RunnerTests/SharedPreferencesTests.m deleted file mode 100644 index 792f6c111b82..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/ios/RunnerTests/SharedPreferencesTests.m +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -@import shared_preferences_ios; -@import XCTest; - -@interface SharedPreferencesTests : XCTestCase -@end - -@implementation SharedPreferencesTests - -- (void)testPlugin { - FLTSharedPreferencesPlugin *plugin = [[FLTSharedPreferencesPlugin alloc] init]; - XCTAssertNotNil(plugin); -} - -@end diff --git a/packages/shared_preferences/shared_preferences_ios/example/lib/main.dart b/packages/shared_preferences/shared_preferences_ios/example/lib/main.dart deleted file mode 100644 index bb513b09f6d5..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/lib/main.dart +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// ignore_for_file: public_member_api_docs - -import 'package:flutter/material.dart'; -import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; - -void main() { - runApp(const MyApp()); -} - -class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const MaterialApp( - title: 'SharedPreferences Demo', - home: SharedPreferencesDemo(), - ); - } -} - -class SharedPreferencesDemo extends StatefulWidget { - const SharedPreferencesDemo({Key? key}) : super(key: key); - - @override - SharedPreferencesDemoState createState() => SharedPreferencesDemoState(); -} - -class SharedPreferencesDemoState extends State { - final SharedPreferencesStorePlatform _prefs = - SharedPreferencesStorePlatform.instance; - late Future _counter; - - // Includes the prefix because this is using the platform interface directly, - // but the prefix (which the native code assumes is present) is added by the - // app-facing package. - static const String _prefKey = 'flutter.counter'; - - Future _incrementCounter() async { - final Map values = await _prefs.getAll(); - final int counter = ((values[_prefKey] as int?) ?? 0) + 1; - - setState(() { - _counter = _prefs.setValue('Int', _prefKey, counter).then((bool success) { - return counter; - }); - }); - } - - @override - void initState() { - super.initState(); - _counter = _prefs.getAll().then((Map values) { - return (values[_prefKey] as int?) ?? 0; - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('SharedPreferences Demo'), - ), - body: Center( - child: FutureBuilder( - future: _counter, - builder: (BuildContext context, AsyncSnapshot snapshot) { - switch (snapshot.connectionState) { - case ConnectionState.waiting: - return const CircularProgressIndicator(); - default: - if (snapshot.hasError) { - return Text('Error: ${snapshot.error}'); - } else { - return Text( - 'Button tapped ${snapshot.data} time${snapshot.data == 1 ? '' : 's'}.\n\n' - 'This should persist across restarts.', - ); - } - } - })), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), - ); - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_ios/example/pubspec.yaml deleted file mode 100644 index 446cea1e0508..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/example/pubspec.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: shared_preferences_example -description: Demonstrates how to use the shared_preferences plugin. -publish_to: none - -environment: - sdk: ">=2.14.0 <3.0.0" - flutter: ">=2.10.0" - -dependencies: - flutter: - sdk: flutter - shared_preferences_ios: - # When depending on this package from a real application you should use: - # shared_preferences_ios: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. - path: ../ - shared_preferences_platform_interface: ^2.0.0 - -dev_dependencies: - flutter_driver: - sdk: flutter - flutter_test: - sdk: flutter - integration_test: - sdk: flutter - -flutter: - uses-material-design: true diff --git a/packages/shared_preferences/shared_preferences_ios/ios/Assets/.gitkeep b/packages/shared_preferences/shared_preferences_ios/ios/Assets/.gitkeep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.h b/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.h deleted file mode 100644 index d2d04aee3b64..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import - -@interface FLTSharedPreferencesPlugin : NSObject -@end diff --git a/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.m b/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.m deleted file mode 100644 index bb11da2b5406..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/ios/Classes/FLTSharedPreferencesPlugin.m +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import "FLTSharedPreferencesPlugin.h" -#import "messages.g.h" - -static NSMutableDictionary *getAllPrefs() { - NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier]; - NSDictionary *prefs = [[NSUserDefaults standardUserDefaults] persistentDomainForName:appDomain]; - NSMutableDictionary *filteredPrefs = [NSMutableDictionary dictionary]; - if (prefs != nil) { - for (NSString *candidateKey in prefs) { - if ([candidateKey hasPrefix:@"flutter."]) { - [filteredPrefs setObject:prefs[candidateKey] forKey:candidateKey]; - } - } - } - return filteredPrefs; -} - -@interface FLTSharedPreferencesPlugin () -@end - -@implementation FLTSharedPreferencesPlugin - -+ (void)registerWithRegistrar:(NSObject *)registrar { - FLTSharedPreferencesPlugin *plugin = [[FLTSharedPreferencesPlugin alloc] init]; - UserDefaultsApiSetup(registrar.messenger, plugin); -} - -// Must not return nil unless "error" is set. -- (nullable NSDictionary *)getAllWithError: - (FlutterError *_Nullable __autoreleasing *_Nonnull)error { - return getAllPrefs(); -} - -- (void)clearWithError:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - for (NSString *key in getAllPrefs()) { - [defaults removeObjectForKey:key]; - } -} - -- (void)removeKey:(nonnull NSString *)key - error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[NSUserDefaults standardUserDefaults] removeObjectForKey:key]; -} - -- (void)setBoolKey:(nonnull NSString *)key - value:(nonnull NSNumber *)value - error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[NSUserDefaults standardUserDefaults] setBool:value.boolValue forKey:key]; -} - -- (void)setDoubleKey:(nonnull NSString *)key - value:(nonnull NSNumber *)value - error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[NSUserDefaults standardUserDefaults] setDouble:value.doubleValue forKey:key]; -} - -- (void)setValueKey:(nonnull NSString *)key - value:(nonnull NSString *)value - error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error { - [[NSUserDefaults standardUserDefaults] setValue:value forKey:key]; -} - -@end diff --git a/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.h b/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.h deleted file mode 100644 index 592402344a04..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// Autogenerated from Pigeon (v1.0.16), do not edit directly. -// See also: https://pub.dev/packages/pigeon -#import -@protocol FlutterBinaryMessenger; -@protocol FlutterMessageCodec; -@class FlutterError; -@class FlutterStandardTypedData; - -NS_ASSUME_NONNULL_BEGIN - -/// The codec used by UserDefaultsApi. -NSObject *UserDefaultsApiGetCodec(void); - -@protocol UserDefaultsApi -- (void)removeKey:(NSString *)key error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setBoolKey:(NSString *)key - value:(NSNumber *)value - error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setDoubleKey:(NSString *)key - value:(NSNumber *)value - error:(FlutterError *_Nullable *_Nonnull)error; -- (void)setValueKey:(NSString *)key value:(id)value error:(FlutterError *_Nullable *_Nonnull)error; -- (nullable NSDictionary *)getAllWithError:(FlutterError *_Nullable *_Nonnull)error; -- (void)clearWithError:(FlutterError *_Nullable *_Nonnull)error; -@end - -extern void UserDefaultsApiSetup(id binaryMessenger, - NSObject *_Nullable api); - -NS_ASSUME_NONNULL_END diff --git a/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.m b/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.m deleted file mode 100644 index ea8c45c7a66c..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/ios/Classes/messages.g.m +++ /dev/null @@ -1,178 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// Autogenerated from Pigeon (v1.0.16), do not edit directly. -// See also: https://pub.dev/packages/pigeon -#import "messages.g.h" -#import - -#if !__has_feature(objc_arc) -#error File requires ARC to be enabled. -#endif - -static NSDictionary *wrapResult(id result, FlutterError *error) { - NSDictionary *errorDict = (NSDictionary *)[NSNull null]; - if (error) { - errorDict = @{ - @"code" : (error.code ? error.code : [NSNull null]), - @"message" : (error.message ? error.message : [NSNull null]), - @"details" : (error.details ? error.details : [NSNull null]), - }; - } - return @{ - @"result" : (result ? result : [NSNull null]), - @"error" : errorDict, - }; -} - -@interface UserDefaultsApiCodecReader : FlutterStandardReader -@end -@implementation UserDefaultsApiCodecReader -@end - -@interface UserDefaultsApiCodecWriter : FlutterStandardWriter -@end -@implementation UserDefaultsApiCodecWriter -@end - -@interface UserDefaultsApiCodecReaderWriter : FlutterStandardReaderWriter -@end -@implementation UserDefaultsApiCodecReaderWriter -- (FlutterStandardWriter *)writerWithData:(NSMutableData *)data { - return [[UserDefaultsApiCodecWriter alloc] initWithData:data]; -} -- (FlutterStandardReader *)readerWithData:(NSData *)data { - return [[UserDefaultsApiCodecReader alloc] initWithData:data]; -} -@end - -NSObject *UserDefaultsApiGetCodec() { - static dispatch_once_t s_pred = 0; - static FlutterStandardMessageCodec *s_sharedObject = nil; - dispatch_once(&s_pred, ^{ - UserDefaultsApiCodecReaderWriter *readerWriter = - [[UserDefaultsApiCodecReaderWriter alloc] init]; - s_sharedObject = [FlutterStandardMessageCodec codecWithReaderWriter:readerWriter]; - }); - return s_sharedObject; -} - -void UserDefaultsApiSetup(id binaryMessenger, - NSObject *api) { - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.remove" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(removeKey:error:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(removeKey:error:)", api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSString *arg_key = args[0]; - FlutterError *error; - [api removeKey:arg_key error:&error]; - callback(wrapResult(nil, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.setBool" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(setBoolKey:value:error:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(setBoolKey:value:error:)", - api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSString *arg_key = args[0]; - NSNumber *arg_value = args[1]; - FlutterError *error; - [api setBoolKey:arg_key value:arg_value error:&error]; - callback(wrapResult(nil, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.setDouble" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(setDoubleKey:value:error:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(setDoubleKey:value:error:)", - api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSString *arg_key = args[0]; - NSNumber *arg_value = args[1]; - FlutterError *error; - [api setDoubleKey:arg_key value:arg_value error:&error]; - callback(wrapResult(nil, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.setValue" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(setValueKey:value:error:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(setValueKey:value:error:)", - api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - NSArray *args = message; - NSString *arg_key = args[0]; - id arg_value = args[1]; - FlutterError *error; - [api setValueKey:arg_key value:arg_value error:&error]; - callback(wrapResult(nil, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.getAll" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(getAllWithError:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(getAllWithError:)", api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - FlutterError *error; - NSDictionary *output = [api getAllWithError:&error]; - callback(wrapResult(output, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } - { - FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel - messageChannelWithName:@"dev.flutter.pigeon.UserDefaultsApi.clear" - binaryMessenger:binaryMessenger - codec:UserDefaultsApiGetCodec()]; - if (api) { - NSCAssert([api respondsToSelector:@selector(clearWithError:)], - @"UserDefaultsApi api (%@) doesn't respond to @selector(clearWithError:)", api); - [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { - FlutterError *error; - [api clearWithError:&error]; - callback(wrapResult(nil, error)); - }]; - } else { - [channel setMessageHandler:nil]; - } - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/ios/shared_preferences_ios.podspec b/packages/shared_preferences/shared_preferences_ios/ios/shared_preferences_ios.podspec deleted file mode 100644 index 4126ed0a8cc2..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/ios/shared_preferences_ios.podspec +++ /dev/null @@ -1,23 +0,0 @@ -# -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# -Pod::Spec.new do |s| - s.name = 'shared_preferences_ios' - s.version = '0.0.1' - s.summary = 'Flutter Shared Preferences' - s.description = <<-DESC -Wraps NSUserDefaults, providing a persistent store for simple key-value pairs. - DESC - s.homepage = 'https://github.com/flutter/plugins' - s.license = { :type => 'BSD', :file => '../LICENSE' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_ios' } - s.documentation_url = 'https://pub.dev/packages/shared_preferences' - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' - s.dependency 'Flutter' - - s.platform = :ios, '9.0' - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } -end - diff --git a/packages/shared_preferences/shared_preferences_ios/lib/messages.g.dart b/packages/shared_preferences/shared_preferences_ios/lib/messages.g.dart deleted file mode 100644 index 0e76291fb655..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/lib/messages.g.dart +++ /dev/null @@ -1,179 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// Autogenerated from Pigeon (v1.0.16), do not edit directly. -// See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name -// @dart = 2.12 -import 'dart:async'; -import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List; - -import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer; -import 'package:flutter/services.dart'; - -class _UserDefaultsApiCodec extends StandardMessageCodec { - const _UserDefaultsApiCodec(); -} - -class UserDefaultsApi { - /// Constructor for [UserDefaultsApi]. The [binaryMessenger] named argument is - /// available for dependency injection. If it is left null, the default - /// BinaryMessenger will be used which routes to the host platform. - UserDefaultsApi({BinaryMessenger? binaryMessenger}) - : _binaryMessenger = binaryMessenger; - - final BinaryMessenger? _binaryMessenger; - - static const MessageCodec codec = _UserDefaultsApiCodec(); - - Future remove(String arg_key) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.remove', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = - await channel.send([arg_key]) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return; - } - } - - Future setBool(String arg_key, bool arg_value) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setBool', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = await channel - .send([arg_key, arg_value]) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return; - } - } - - Future setDouble(String arg_key, double arg_value) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = await channel - .send([arg_key, arg_value]) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return; - } - } - - Future setValue(String arg_key, Object arg_value) async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setValue', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = await channel - .send([arg_key, arg_value]) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return; - } - } - - Future> getAll() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.getAll', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = - await channel.send(null) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return (replyMap['result'] as Map?)! - .cast(); - } - } - - Future clear() async { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.clear', codec, - binaryMessenger: _binaryMessenger); - final Map? replyMap = - await channel.send(null) as Map?; - if (replyMap == null) { - throw PlatformException( - code: 'channel-error', - message: 'Unable to establish connection on channel.', - details: null, - ); - } else if (replyMap['error'] != null) { - final Map error = - (replyMap['error'] as Map?)!; - throw PlatformException( - code: (error['code'] as String?)!, - message: error['message'] as String?, - details: error['details'], - ); - } else { - return; - } - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/lib/shared_preferences_ios.dart b/packages/shared_preferences/shared_preferences_ios/lib/shared_preferences_ios.dart deleted file mode 100644 index 10638840804e..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/lib/shared_preferences_ios.dart +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/services.dart'; -import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; -import 'messages.g.dart'; - -typedef _Setter = Future Function(String key, Object value); - -/// iOS implementation of shared_preferences. -class SharedPreferencesIOS extends SharedPreferencesStorePlatform { - final UserDefaultsApi _api = UserDefaultsApi(); - late final Map _setters = { - 'Bool': (String key, Object value) { - return _api.setBool(key, value as bool); - }, - 'Double': (String key, Object value) { - return _api.setDouble(key, value as double); - }, - 'Int': (String key, Object value) { - return _api.setValue(key, value as int); - }, - 'String': (String key, Object value) { - return _api.setValue(key, value as String); - }, - 'StringList': (String key, Object value) { - return _api.setValue(key, value as List); - }, - }; - - /// Registers this class as the default instance of [PathProviderPlatform]. - static void registerWith() { - SharedPreferencesStorePlatform.instance = SharedPreferencesIOS(); - } - - @override - Future clear() async { - await _api.clear(); - return true; - } - - @override - Future> getAll() async { - final Map result = await _api.getAll(); - return result.cast(); - } - - @override - Future remove(String key) async { - await _api.remove(key); - return true; - } - - @override - Future setValue(String valueType, String key, Object value) async { - final _Setter? setter = _setters[valueType]; - if (setter == null) { - throw PlatformException( - code: 'InvalidOperation', - message: '"$valueType" is not a supported type.'); - } - await setter(key, value); - return true; - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/pigeons/messages.dart b/packages/shared_preferences/shared_preferences_ios/pigeons/messages.dart deleted file mode 100644 index 6b5648f9e2f0..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/pigeons/messages.dart +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:pigeon/pigeon.dart'; - -@ConfigurePigeon(PigeonOptions( - dartOut: 'lib/messages.g.dart', - dartTestOut: 'test/messages.g.dart', - objcHeaderOut: 'ios/Classes/messages.g.h', - objcSourceOut: 'ios/Classes/messages.g.m', - copyrightHeader: 'pigeons/copyright_header.txt', -)) -@HostApi(dartHostTestHandler: 'TestUserDefaultsApi') -abstract class UserDefaultsApi { - void remove(String key); - void setBool(String key, bool value); - void setDouble(String key, double value); - void setValue(String key, Object value); - Map getAll(); - void clear(); -} diff --git a/packages/shared_preferences/shared_preferences_ios/pubspec.yaml b/packages/shared_preferences/shared_preferences_ios/pubspec.yaml deleted file mode 100644 index 45b1aae2c473..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/pubspec.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: shared_preferences_ios -description: iOS implementation of the shared_preferences plugin -repository: https://github.com/flutter/plugins/tree/main/packages/shared_preferences/shared_preferences_ios -issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.1.1 - -environment: - sdk: ">=2.14.0 <3.0.0" - flutter: ">=2.10.0" - -flutter: - plugin: - implements: shared_preferences - platforms: - ios: - dartPluginClass: SharedPreferencesIOS - pluginClass: FLTSharedPreferencesPlugin - -dependencies: - flutter: - sdk: flutter - shared_preferences_platform_interface: ^2.0.0 - -dev_dependencies: - flutter_test: - sdk: flutter - pigeon: ^1.0.16 diff --git a/packages/shared_preferences/shared_preferences_ios/test/messages.g.dart b/packages/shared_preferences/shared_preferences_ios/test/messages.g.dart deleted file mode 100644 index 12fbc0635784..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/test/messages.g.dart +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// Autogenerated from Pigeon (v1.0.16), do not edit directly. -// See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import -// @dart = 2.12 -import 'dart:async'; -import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List; -import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer; -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:shared_preferences_ios/messages.g.dart'; - -class _TestUserDefaultsApiCodec extends StandardMessageCodec { - const _TestUserDefaultsApiCodec(); -} - -abstract class TestUserDefaultsApi { - static const MessageCodec codec = _TestUserDefaultsApiCodec(); - - void remove(String key); - void setBool(String key, bool value); - void setDouble(String key, double value); - void setValue(String key, Object value); - Map getAll(); - void clear(); - static void setup(TestUserDefaultsApi? api, - {BinaryMessenger? binaryMessenger}) { - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.remove', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null.'); - final List args = (message as List?)!; - final String? arg_key = (args[0] as String?); - assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null, expected non-null String.'); - api.remove(arg_key!); - return {}; - }); - } - } - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setBool', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null.'); - final List args = (message as List?)!; - final String? arg_key = (args[0] as String?); - assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null String.'); - final bool? arg_value = (args[1] as bool?); - assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null bool.'); - api.setBool(arg_key!, arg_value!); - return {}; - }); - } - } - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null.'); - final List args = (message as List?)!; - final String? arg_key = (args[0] as String?); - assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null String.'); - final double? arg_value = (args[1] as double?); - assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null double.'); - api.setDouble(arg_key!, arg_value!); - return {}; - }); - } - } - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setValue', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null.'); - final List args = (message as List?)!; - final String? arg_key = (args[0] as String?); - assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null String.'); - final Object? arg_value = (args[1] as Object?); - assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null Object.'); - api.setValue(arg_key!, arg_value!); - return {}; - }); - } - } - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.getAll', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - // ignore message - final Map output = api.getAll(); - return {'result': output}; - }); - } - } - { - final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.clear', codec, - binaryMessenger: binaryMessenger); - if (api == null) { - channel.setMockMessageHandler(null); - } else { - channel.setMockMessageHandler((Object? message) async { - // ignore message - api.clear(); - return {}; - }); - } - } - } -} diff --git a/packages/shared_preferences/shared_preferences_ios/test/shared_preferences_ios_test.dart b/packages/shared_preferences/shared_preferences_ios/test/shared_preferences_ios_test.dart deleted file mode 100644 index efafb230d9de..000000000000 --- a/packages/shared_preferences/shared_preferences_ios/test/shared_preferences_ios_test.dart +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:shared_preferences_ios/shared_preferences_ios.dart'; -import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; - -import 'messages.g.dart'; - -class _MockSharedPreferencesApi implements TestUserDefaultsApi { - final Map items = {}; - - @override - Map getAll() { - return items; - } - - @override - void remove(String key) { - items.remove(key); - } - - @override - void setBool(String key, bool value) { - items[key] = value; - } - - @override - void setDouble(String key, double value) { - items[key] = value; - } - - @override - void setValue(String key, Object value) { - items[key] = value; - } - - @override - void clear() { - items.clear(); - } -} - -void main() { - TestWidgetsFlutterBinding.ensureInitialized(); - _MockSharedPreferencesApi api = _MockSharedPreferencesApi(); - SharedPreferencesIOS plugin = SharedPreferencesIOS(); - - setUp(() { - api = _MockSharedPreferencesApi(); - TestUserDefaultsApi.setup(api); - plugin = SharedPreferencesIOS(); - }); - - test('registerWith', () { - SharedPreferencesIOS.registerWith(); - expect( - SharedPreferencesStorePlatform.instance, isA()); - }); - - test('remove', () async { - api.items['flutter.hi'] = 'world'; - expect(await plugin.remove('flutter.hi'), isTrue); - expect(api.items.containsKey('flutter.hi'), isFalse); - }); - - test('clear', () async { - api.items['flutter.hi'] = 'world'; - expect(await plugin.clear(), isTrue); - expect(api.items.containsKey('flutter.hi'), isFalse); - }); - - test('getAll', () async { - api.items['flutter.hi'] = 'world'; - api.items['flutter.bye'] = 'dust'; - final Map all = await plugin.getAll(); - expect(all.length, 2); - expect(all['flutter.hi'], api.items['flutter.hi']); - expect(all['flutter.bye'], api.items['flutter.bye']); - }); - - test('setValue', () async { - expect(await plugin.setValue('Bool', 'flutter.Bool', true), isTrue); - expect(api.items['flutter.Bool'], true); - expect(await plugin.setValue('Double', 'flutter.Double', 1.5), isTrue); - expect(api.items['flutter.Double'], 1.5); - expect(await plugin.setValue('Int', 'flutter.Int', 12), isTrue); - expect(api.items['flutter.Int'], 12); - expect(await plugin.setValue('String', 'flutter.String', 'hi'), isTrue); - expect(api.items['flutter.String'], 'hi'); - expect( - await plugin - .setValue('StringList', 'flutter.StringList', ['hi']), - isTrue); - expect(api.items['flutter.StringList'], ['hi']); - }); - - test('setValue with unsupported type', () { - expect(() async { - await plugin.setValue('Map', 'flutter.key', {}); - }, throwsA(isA())); - }); -} diff --git a/packages/shared_preferences/shared_preferences_macos/AUTHORS b/packages/shared_preferences/shared_preferences_macos/AUTHORS deleted file mode 100644 index 493a0b4ef9c2..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/AUTHORS +++ /dev/null @@ -1,66 +0,0 @@ -# Below is a list of people and organizations that have contributed -# to the Flutter project. Names should be added to the list like so: -# -# Name/Organization - -Google Inc. -The Chromium Authors -German Saprykin -Benjamin Sauer -larsenthomasj@gmail.com -Ali Bitek -Pol Batlló -Anatoly Pulyaevskiy -Hayden Flinner -Stefano Rodriguez -Salvatore Giordano -Brian Armstrong -Paul DeMarco -Fabricio Nogueira -Simon Lightfoot -Ashton Thomas -Thomas Danner -Diego Velásquez -Hajime Nakamura -Tuyển Vũ Xuân -Miguel Ruivo -Sarthak Verma -Mike Diarmid -Invertase -Elliot Hesp -Vince Varga -Aawaz Gyawali -EUI Limited -Katarina Sheremet -Thomas Stockx -Sarbagya Dhaubanjar -Ozkan Eksi -Rishab Nayak -ko2ic -Jonathan Younger -Jose Sanchez -Debkanchan Samadder -Audrius Karosevicius -Lukasz Piliszczuk -SoundReply Solutions GmbH -Rafal Wachol -Pau Picas -Christian Weder -Alexandru Tuca -Christian Weder -Rhodes Davis Jr. -Luigi Agosti -Quentin Le Guennec -Koushik Ravikumar -Nissim Dsilva -Giancarlo Rocha -Ryo Miyake -Théo Champion -Kazuki Yamaguchi -Eitan Schwartz -Chris Rutkowski -Juan Alvarez -Aleksandr Yurkovskiy -Anton Borries -Alex Li -Rahul Raj <64.rahulraj@gmail.com> diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md deleted file mode 100644 index f0a852637c52..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ /dev/null @@ -1,82 +0,0 @@ -## 2.0.5 - -* Converts platform channel to Pigeon. -* Updates code for `no_leading_underscores_for_local_identifiers` lint. -* Updates minimum Flutter version to 2.10. - -## 2.0.4 - -* Removes unnecessary imports. -* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors - lint warnings. - -## 2.0.3 - -* Switches to an in-package method channel implementation. -* Fixes newly enabled analyzer options. - -## 2.0.2 - -* Add native unit tests. -* Updated installation instructions in README. - -## 2.0.1 - -* Add `implements` to the pubspec. - -## 2.0.0 - -* Migrate to null safety. - -## 0.0.1+12 - -* Update Flutter SDK constraint. - -## 0.0.1+11 - -* Remove unused `test` dependency. -* Update Dart SDK constraint in example. - -## 0.0.1+10 - -* Remove iOS and Android folders from the example app. - -## 0.0.1+9 - -* Remove Android folder from `shared_preferences_macos`. - -## 0.0.1+8 - -* Declare API stability and compatibility with `1.0.0` (more details at: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0). - -## 0.0.1+7 - -* Fix CocoaPods podspec lint warnings. - -## 0.0.1+6 - -* Make the pedantic dev_dependency explicit. - -## 0.0.1+5 - -* Fix readme - -## 0.0.1+4 - -* Bump gradle version to avoid bugs with android projects - -## 0.0.1+3 - -* Update README. - -## 0.0.1+2 - -* Remove unused onMethodCall method. - -## 0.0.1+1 - -* Add an android/ folder with no-op implementation to workaround https://github.com/flutter/flutter/issues/46898. - -## 0.0.1 - -* Initial open source release. diff --git a/packages/shared_preferences/shared_preferences_macos/LICENSE b/packages/shared_preferences/shared_preferences_macos/LICENSE deleted file mode 100644 index c6823b81eb84..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright 2013 The Flutter Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/shared_preferences/shared_preferences_macos/README.md b/packages/shared_preferences/shared_preferences_macos/README.md deleted file mode 100644 index e9cd7f25be03..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# shared\_preferences\_macos - -The macos implementation of [`shared_preferences`][1]. - -## Usage - -This package is [endorsed][2], which means you can simply use `shared_preferences` -normally. This package will be automatically included in your app when you do. - -[1]: https://pub.dev/packages/shared_preferences -[2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin diff --git a/packages/shared_preferences/shared_preferences_macos/example/README.md b/packages/shared_preferences/shared_preferences_macos/example/README.md deleted file mode 100644 index 96b8bb17dbff..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/example/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Platform Implementation Test App - -This is a test app for manual testing and automated integration testing -of this platform implementation. It is not intended to demonstrate actual use of -this package, since the intent is that plugin clients use the app-facing -package. - -Unless you are making changes to this implementation package, this example is -very unlikely to be relevant. diff --git a/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart deleted file mode 100644 index a980eab26679..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter_test/flutter_test.dart'; -import 'package:integration_test/integration_test.dart'; -import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; - -void main() { - IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - - group('SharedPreferencesMacOS', () { - const Map kTestValues = { - 'flutter.String': 'hello world', - 'flutter.bool': true, - 'flutter.int': 42, - 'flutter.double': 3.14159, - 'flutter.List': ['foo', 'bar'], - }; - - const Map kTestValues2 = { - 'flutter.String': 'goodbye world', - 'flutter.bool': false, - 'flutter.int': 1337, - 'flutter.double': 2.71828, - 'flutter.List': ['baz', 'quox'], - }; - - late SharedPreferencesStorePlatform preferences; - - setUp(() async { - preferences = SharedPreferencesStorePlatform.instance; - }); - - tearDown(() { - preferences.clear(); - }); - - // Normally the app-facing package adds the prefix, but since this test - // bypasses the app-facing package it needs to be manually added. - String prefixedKey(String key) { - return 'flutter.$key'; - } - - testWidgets('reading', (WidgetTester _) async { - final Map values = await preferences.getAll(); - expect(values[prefixedKey('String')], isNull); - expect(values[prefixedKey('bool')], isNull); - expect(values[prefixedKey('int')], isNull); - expect(values[prefixedKey('double')], isNull); - expect(values[prefixedKey('List')], isNull); - }); - - testWidgets('writing', (WidgetTester _) async { - await Future.wait(>[ - preferences.setValue( - 'String', prefixedKey('String'), kTestValues2['flutter.String']!), - preferences.setValue( - 'Bool', prefixedKey('bool'), kTestValues2['flutter.bool']!), - preferences.setValue( - 'Int', prefixedKey('int'), kTestValues2['flutter.int']!), - preferences.setValue( - 'Double', prefixedKey('double'), kTestValues2['flutter.double']!), - preferences.setValue( - 'StringList', prefixedKey('List'), kTestValues2['flutter.List']!) - ]); - final Map values = await preferences.getAll(); - expect(values[prefixedKey('String')], kTestValues2['flutter.String']); - expect(values[prefixedKey('bool')], kTestValues2['flutter.bool']); - expect(values[prefixedKey('int')], kTestValues2['flutter.int']); - expect(values[prefixedKey('double')], kTestValues2['flutter.double']); - expect(values[prefixedKey('List')], kTestValues2['flutter.List']); - }); - - testWidgets('removing', (WidgetTester _) async { - final String key = prefixedKey('testKey'); - await preferences.setValue('String', key, kTestValues['flutter.String']!); - await preferences.setValue('Bool', key, kTestValues['flutter.bool']!); - await preferences.setValue('Int', key, kTestValues['flutter.int']!); - await preferences.setValue('Double', key, kTestValues['flutter.double']!); - await preferences.setValue( - 'StringList', key, kTestValues['flutter.List']!); - await preferences.remove(key); - final Map values = await preferences.getAll(); - expect(values[key], isNull); - }); - - testWidgets('clearing', (WidgetTester _) async { - await preferences.setValue( - 'String', 'String', kTestValues['flutter.String']!); - await preferences.setValue('Bool', 'bool', kTestValues['flutter.bool']!); - await preferences.setValue('Int', 'int', kTestValues['flutter.int']!); - await preferences.setValue( - 'Double', 'double', kTestValues['flutter.double']!); - await preferences.setValue( - 'StringList', 'List', kTestValues['flutter.List']!); - await preferences.clear(); - final Map values = await preferences.getAll(); - expect(values['String'], null); - expect(values['bool'], null); - expect(values['int'], null); - expect(values['double'], null); - expect(values['List'], null); - }); - }); -} diff --git a/packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/Info.plist b/packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/Info.plist deleted file mode 100644 index 64d65ca49577..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/packages/shared_preferences/shared_preferences_macos/example/test_driver/integration_test.dart b/packages/shared_preferences/shared_preferences_macos/example/test_driver/integration_test.dart deleted file mode 100644 index 4f10f2a522f3..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/example/test_driver/integration_test.dart +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:integration_test/integration_test_driver.dart'; - -Future main() => integrationDriver(); diff --git a/packages/shared_preferences/shared_preferences_macos/pigeons/copyright_header.txt b/packages/shared_preferences/shared_preferences_macos/pigeons/copyright_header.txt deleted file mode 100644 index fb682b1ab965..000000000000 --- a/packages/shared_preferences/shared_preferences_macos/pigeons/copyright_header.txt +++ /dev/null @@ -1,3 +0,0 @@ -Copyright 2013 The Flutter Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. \ No newline at end of file diff --git a/script/configs/exclude_all_plugins_app.yaml b/script/configs/exclude_all_plugins_app.yaml index 8dd0fde5ef5f..42df421df35d 100644 --- a/script/configs/exclude_all_plugins_app.yaml +++ b/script/configs/exclude_all_plugins_app.yaml @@ -8,3 +8,8 @@ # This is a permament entry, as it should never be a direct app dependency. - plugin_platform_interface +# Temporarily excluded to avoid runtime conflicts with +# shared_preferences_macos and _ios, which are still what shared_preferences +# uses. This will be removed when the switch to shared_preferences_foundation +# is complete. See https://github.com/flutter/flutter/issues/117941 +- shared_preferences_foundation