Skip to content

Commit a3e1724

Browse files
authored
Merge pull request #1094 from calvincestari/spm-manifest-platforms
Align platform versions in SPM manifest and Xcode project
2 parents e191c7d + d6eb85b commit a3e1724

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

Package.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ import PackageDescription
33

44
let package = Package(
55
name: "SQLite.swift",
6+
platforms: [
7+
.iOS(.v9),
8+
.macOS(.v10_15),
9+
.watchOS(.v3),
10+
.tvOS(.v9)
11+
],
612
products: [
713
.library(
814
name: "SQLite",

SQLite.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,6 @@
10991099
SDKROOT = appletvos;
11001100
SKIP_INSTALL = YES;
11011101
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1102-
TVOS_DEPLOYMENT_TARGET = 12.0;
11031102
};
11041103
name = Debug;
11051104
};
@@ -1121,7 +1120,6 @@
11211120
SDKROOT = appletvos;
11221121
SKIP_INSTALL = YES;
11231122
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1124-
TVOS_DEPLOYMENT_TARGET = 12.0;
11251123
};
11261124
name = Release;
11271125
};
@@ -1135,7 +1133,6 @@
11351133
PRODUCT_NAME = "$(TARGET_NAME)";
11361134
SDKROOT = appletvos;
11371135
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1138-
TVOS_DEPLOYMENT_TARGET = 12.0;
11391136
};
11401137
name = Debug;
11411138
};
@@ -1149,7 +1146,6 @@
11491146
PRODUCT_NAME = "$(TARGET_NAME)";
11501147
SDKROOT = appletvos;
11511148
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1152-
TVOS_DEPLOYMENT_TARGET = 12.0;
11531149
};
11541150
name = Release;
11551151
};
@@ -1173,7 +1169,6 @@
11731169
SKIP_INSTALL = YES;
11741170
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
11751171
TARGETED_DEVICE_FAMILY = 4;
1176-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
11771172
};
11781173
name = Debug;
11791174
};
@@ -1197,7 +1192,6 @@
11971192
SKIP_INSTALL = YES;
11981193
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
11991194
TARGETED_DEVICE_FAMILY = 4;
1200-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12011195
};
12021196
name = Release;
12031197
};
@@ -1259,8 +1253,10 @@
12591253
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
12601254
SWIFT_VERSION = 5.0;
12611255
TARGETED_DEVICE_FAMILY = "1,2,3";
1256+
TVOS_DEPLOYMENT_TARGET = 9.1;
12621257
VERSIONING_SYSTEM = "apple-generic";
12631258
VERSION_INFO_PREFIX = "";
1259+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
12641260
};
12651261
name = Debug;
12661262
};
@@ -1315,9 +1311,11 @@
13151311
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
13161312
SWIFT_VERSION = 5.0;
13171313
TARGETED_DEVICE_FAMILY = "1,2,3";
1314+
TVOS_DEPLOYMENT_TARGET = 9.1;
13181315
VALIDATE_PRODUCT = YES;
13191316
VERSIONING_SYSTEM = "apple-generic";
13201317
VERSION_INFO_PREFIX = "";
1318+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
13211319
};
13221320
name = Release;
13231321
};
@@ -1334,7 +1332,6 @@
13341332
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
13351333
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
13361334
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1337-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
13381335
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13391336
MARKETING_VERSION = 0.13.0;
13401337
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
@@ -1358,7 +1355,6 @@
13581355
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
13591356
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
13601357
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1361-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
13621358
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13631359
MARKETING_VERSION = 0.13.0;
13641360
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;

Tests/SPM/Package.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ import PackageDescription
55

66
let package = Package(
77
name: "test",
8+
platforms: [
9+
.iOS(.v9),
10+
.macOS(.v10_15),
11+
.watchOS(.v3),
12+
.tvOS(.v9)
13+
],
814
dependencies: [
915
// for testing from same repository
1016
.package(path: "../..")

0 commit comments

Comments
 (0)