From 818af0882507b0e468c9ec40fa2149a52a4ad171 Mon Sep 17 00:00:00 2001 From: Calvin Cestari Date: Wed, 3 Nov 2021 12:59:38 -0700 Subject: [PATCH 1/3] Add platform versions to the SPM manifest --- Package.swift | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Package.swift b/Package.swift index f4938678..47c00b37 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,12 @@ import PackageDescription let package = Package( name: "SQLite.swift", + platforms: [ + .iOS(.v9), + .macOS(.v10_15), + .watchOS(.v3), + .tvOS(.v9) + ], products: [ .library( name: "SQLite", @@ -46,6 +52,12 @@ package.dependencies = [.package(url: "https://github.com/stephencelis/CSQLite.g package.targets = [ .target( name: "SQLite", + platforms: [ + .iOS(.v9), + .macOS(.v10_15), + .watchOS(.v3), + .tvOS(.v9) + ], dependencies: [.product(name: "CSQLite", package: "CSQLite")], exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"] ), From 9af505317fff1d9129a4c905fa2e8757c3484fc0 Mon Sep 17 00:00:00 2001 From: Calvin Cestari Date: Wed, 3 Nov 2021 13:00:23 -0700 Subject: [PATCH 2/3] Move XCode deployment version from targets to project --- SQLite.xcodeproj/project.pbxproj | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index ba14e9ae..aecb424a 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -1099,7 +1099,6 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1121,7 +1120,6 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -1135,7 +1133,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -1149,7 +1146,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -1173,7 +1169,6 @@ SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; }; @@ -1197,7 +1192,6 @@ SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release; }; @@ -1259,8 +1253,10 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.1; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Debug; }; @@ -1315,9 +1311,11 @@ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 9.1; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 3.0; }; name = Release; }; @@ -1334,7 +1332,6 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.13.0; PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite; @@ -1358,7 +1355,6 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.13.0; PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite; From d6eb85b381da062ffe2db30739f868607dc1c4c9 Mon Sep 17 00:00:00 2001 From: Calvin Cestari Date: Fri, 5 Nov 2021 12:13:00 -0700 Subject: [PATCH 3/3] Fix test platform versions --- Package.swift | 6 ------ Tests/SPM/Package.swift | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 47c00b37..abce8395 100644 --- a/Package.swift +++ b/Package.swift @@ -52,12 +52,6 @@ package.dependencies = [.package(url: "https://github.com/stephencelis/CSQLite.g package.targets = [ .target( name: "SQLite", - platforms: [ - .iOS(.v9), - .macOS(.v10_15), - .watchOS(.v3), - .tvOS(.v9) - ], dependencies: [.product(name: "CSQLite", package: "CSQLite")], exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"] ), diff --git a/Tests/SPM/Package.swift b/Tests/SPM/Package.swift index 265021e5..91c0c6d1 100644 --- a/Tests/SPM/Package.swift +++ b/Tests/SPM/Package.swift @@ -5,6 +5,12 @@ import PackageDescription let package = Package( name: "test", + platforms: [ + .iOS(.v9), + .macOS(.v10_15), + .watchOS(.v3), + .tvOS(.v9) + ], dependencies: [ // for testing from same repository .package(path: "../..")