[shared_preferences] Merge iOS and macOS implementations

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

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.

packages/shared_preferences/shared_preferences_ios/README.md → 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
 

packages/shared_preferences/shared_preferences_macos/macos/Classes/SharedPreferencesPlugin.swift → 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?] {

packages/shared_preferences/shared_preferences_macos/example/macos/RunnerTests/RunnerTests.swift → 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 {

packages/shared_preferences/shared_preferences_macos/macos/shared_preferences_macos.podspec → 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' => '[email protected]' }
-  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
-

packages/shared_preferences/shared_preferences_ios/example/.gitignore → 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
 

packages/shared_preferences/shared_preferences_ios/example/integration_test/shared_preferences_test.dart → 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<String, Object> kTestValues = <String, Object>{
       'flutter.String': 'hello world',
       'flutter.bool': true,

packages/shared_preferences/shared_preferences_ios/example/ios/.gitignore → 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/

packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/AppFrameworkInfo.plist → packages/shared_preferences/shared_preferences_foundation/example/ios/Flutter/AppFrameworkInfo.plist

@@ -20,11 +20,7 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>UIRequiredDeviceCapabilities</key>
-  <array>
-    <string>arm64</string>
-  </array>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Debug.xcconfig → 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"

packages/shared_preferences/shared_preferences_ios/example/ios/Flutter/Release.xcconfig → 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"

packages/shared_preferences/shared_preferences_ios/example/ios/Podfile → 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