Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align platform versions in SPM manifest and Xcode project #1094

Merged
merged 3 commits into from
Nov 5, 2021
Merged

Align platform versions in SPM manifest and Xcode project #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818af08
Add platform versions to the SPM manifest
calvincestari Nov 3, 2021
9af5053
Move XCode deployment version from targets to project
calvincestari Nov 3, 2021
d6eb85b
Fix test platform versions
calvincestari Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 4 additions & 8 deletions SQLite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1121,7 +1120,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand All @@ -1135,7 +1133,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1149,7 +1146,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand All @@ -1173,7 +1169,6 @@
SKIP_INSTALL = YES;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Debug;
};
Expand All @@ -1197,7 +1192,6 @@
SKIP_INSTALL = YES;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.0;
};
name = Release;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions Tests/SPM/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "../..")
Expand Down