[shared_preferences_foundation] Adds Swift Package Manager compatibil…

…ity (flutter#6640) Makes `shared_preferences_foundation` available as a Swift Package to Flutter. Also, remains compatible with CocoaPods. Fixes flutter#146918.
engine-flutter-autoroll · May 6, 2024 · 5ccddfc · 5ccddfc
1 parent 45a4573
commit 5ccddfc
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 11 deletions.
diff --git a/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md b/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 2.4.0
 
+* Adds Swift Package Manager compatibility.
 * Updates minimum iOS version to 12.0 and minimum Flutter version to 3.16.6.
 
 ## 2.3.5

diff --git a/...ed_preferences/shared_preferences_foundation/darwin/shared_preferences_foundation.podspec b/...ed_preferences/shared_preferences_foundation/darwin/shared_preferences_foundation.podspec
@@ -12,7 +12,7 @@ Wraps NSUserDefaults, providing a persistent store for simple key-value pairs.
   s.license          = { :type => 'BSD', :file => '../LICENSE' }
   s.author           = { 'Flutter Team' => 'flutter-dev@googlegroups.com' }
   s.source           = { :http => 'https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_foundation' }
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'shared_preferences_foundation/Sources/shared_preferences_foundation/**/*.swift'
   s.ios.dependency 'Flutter'
   s.osx.dependency 'FlutterMacOS'
   s.ios.deployment_target = '12.0'
@@ -23,6 +23,6 @@ Wraps NSUserDefaults, providing a persistent store for simple key-value pairs.
      'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift',
   }
   s.swift_version = '5.0'
-  s.resource_bundles = {'shared_preferences_foundation_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'shared_preferences_foundation_privacy' => ['shared_preferences_foundation/Sources/shared_preferences_foundation/Resources/PrivacyInfo.xcprivacy']}
 
 end
diff --git a/...ferences/shared_preferences_foundation/darwin/shared_preferences_foundation/Package.swift b/...ferences/shared_preferences_foundation/darwin/shared_preferences_foundation/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+
+// 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 PackageDescription
+
+let package = Package(
+  name: "shared_preferences_foundation",
+  platforms: [
+    .iOS("12.0"),
+    .macOS("10.14"),
+  ],
+  products: [
+    .library(name: "shared-preferences-foundation", targets: ["shared_preferences_foundation"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "shared_preferences_foundation",
+      dependencies: [],
+      resources: [
+        .process("Resources")
+      ]
+    )
+  ]
+)
diff --git a/...on/darwin/Resources/PrivacyInfo.xcprivacy → ...oundation/Resources/PrivacyInfo.xcprivacy b/...on/darwin/Resources/PrivacyInfo.xcprivacy → ...oundation/Resources/PrivacyInfo.xcprivacy
diff --git a/...win/Classes/SharedPreferencesPlugin.swift → ..._foundation/SharedPreferencesPlugin.swift b/...win/Classes/SharedPreferencesPlugin.swift → ..._foundation/SharedPreferencesPlugin.swift
diff --git a/...oundation/darwin/Classes/messages.g.swift → ...d_preferences_foundation/messages.g.swift b/...oundation/darwin/Classes/messages.g.swift → ...d_preferences_foundation/messages.g.swift
diff --git a/...ed_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj b/...ed_preferences/shared_preferences_foundation/example/ios/Runner.xcodeproj/project.pbxproj
@@ -215,7 +215,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {

diff --git a/...references_foundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...references_foundation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...ges/shared_preferences/shared_preferences_foundation/example/ios/Runner/AppDelegate.swift b/...ges/shared_preferences/shared_preferences_foundation/example/ios/Runner/AppDelegate.swift
@@ -5,7 +5,7 @@
 import Flutter
 import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/..._preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj b/..._preferences/shared_preferences_foundation/example/macos/Runner.xcodeproj/project.pbxproj
@@ -260,7 +260,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1250;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/...ferences_foundation/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...ferences_foundation/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...s/shared_preferences/shared_preferences_foundation/example/macos/Runner/AppDelegate.swift b/...s/shared_preferences/shared_preferences_foundation/example/macos/Runner/AppDelegate.swift
@@ -5,7 +5,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true

diff --git a/packages/shared_preferences/shared_preferences_foundation/pigeons/messages.dart b/packages/shared_preferences/shared_preferences_foundation/pigeons/messages.dart
@@ -7,7 +7,8 @@ import 'package:pigeon/pigeon.dart';
 @ConfigurePigeon(PigeonOptions(
   dartOut: 'lib/messages.g.dart',
   dartTestOut: 'test/test_api.g.dart',
-  swiftOut: 'darwin/Classes/messages.g.swift',
+  swiftOut:
+      'darwin/shared_preferences_foundation/Sources/shared_preferences_foundation/messages.g.swift',
   copyrightHeader: 'pigeons/copyright_header.txt',
 ))
 @HostApi(dartHostTestHandler: 'TestUserDefaultsApi')

diff --git a/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml b/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml
@@ -2,7 +2,7 @@ name: shared_preferences_foundation
 description: iOS and macOS implementation of the shared_preferences plugin.
 repository: https://github.com/flutter/packages/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.3.5
+version: 2.4.0
 
 environment:
   sdk: ^3.2.3