From 25593754913d228777f14634bc6f493dbeb4e9fb Mon Sep 17 00:00:00 2001 From: John Estropia <rommel.estropia@gmail.com> Date: Tue, 13 Sep 2022 09:26:21 +0900 Subject: [PATCH] Raise watchOS min version to 7.4 as supported by Xcode 14 unit tests --- CoreStore.podspec | 7 +++++-- CoreStore.xcodeproj/project.pbxproj | 10 ++++++---- .../xcshareddata/WorkspaceSettings.xcsettings | 5 ++++- Package.swift | 2 +- README.md | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CoreStore.podspec b/CoreStore.podspec index c444fba6..d4e757e6 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = "13.0" s.osx.deployment_target = "10.15" s.tvos.deployment_target = "13.0" - s.watchos.deployment_target = "6.0" + s.watchos.deployment_target = "7.4" s.source_files = "Sources", "Sources/**/*.swift" s.public_header_files = "Sources/**/*.h" @@ -27,6 +27,9 @@ Pod::Spec.new do |s| ts.preserve_paths = "CoreStoreTests/**/*.xcdatamodeld" ts.frameworks = "Foundation", "CoreData" ts.requires_arc = true - ts.platforms = { :ios => nil, :osx => nil, :tvos => nil, :watchos => nil } + ts.ios.deployment_target = "13.0" + ts.osx.deployment_target = "10.15" + ts.tvos.deployment_target = "13.0" + ts.watchos.deployment_target = "7.4" end end diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 3bef46ba..d9cb0d32 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -3021,7 +3021,7 @@ TVOS_DEPLOYMENT_TARGET = 13.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Debug; }; @@ -3086,7 +3086,7 @@ VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Release; }; @@ -3275,6 +3275,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Debug; }; @@ -3294,6 +3295,7 @@ SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Release; }; @@ -3422,7 +3424,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Debug; }; @@ -3451,7 +3453,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 6.0; + WATCHOS_DEPLOYMENT_TARGET = 7.4; }; name = Release; }; diff --git a/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376e..f9b0d7c5 100644 --- a/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> -<dict/> +<dict> + <key>PreviewsEnabled</key> + <false/> +</dict> </plist> diff --git a/Package.swift b/Package.swift index bdbd9424..68aa8cae 100644 --- a/Package.swift +++ b/Package.swift @@ -29,7 +29,7 @@ import PackageDescription let package = Package( name: "CoreStore", platforms: [ - .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6) + .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v7) ], products: [ .library(name: "CoreStore", targets: ["CoreStore"]) diff --git a/README.md b/README.md index 5775e637..8c6d7670 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift <br /> </p> -* **Swift 5.7:** iOS 13+ / macOS 10.15+ / watchOS 6.0+ / tvOS 13.0+ +* **Swift 5.7:** iOS 13+ / macOS 10.15+ / watchOS 7.4+ / tvOS 13.0+ * Previously supported Swift versions: [Swift 5.5](https://github.com/JohnEstropia/CoreStore/tree/8.1.0), [Swift 5.4](https://github.com/JohnEstropia/CoreStore/tree/8.0.1), [Swift 5.3](https://github.com/JohnEstropia/CoreStore/tree/7.3.1) Upgrading from previous CoreStore versions? Check out the [🆕 features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).