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

Move OSX deployment target back to 10.10 #1095

Merged
merged 6 commits into from
Nov 6, 2021
Merged

Move OSX deployment target back to 10.10 #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d02d0b4
Move OSX deployment target back to 10.10
jberkel Nov 5, 2021
34798be
Update changelog
jberkel Nov 5, 2021
883117c
"macos-latest" is not the latest :(
jberkel Nov 5, 2021
13d7894
iOS 15.0
jberkel Nov 5, 2021
7c01062
iOS version
jberkel Nov 5, 2021
47c7004
YML insanity
jberkel 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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build and test
on: [push, pull_request]
env:
IOS_SIMULATOR: iPhone 12
IOS_VERSION: 14.4
IOS_VERSION: "15.0"
jobs:
build:
runs-on: macos-latest
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- name: Install
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
* Support for custom SQL aggregates ([#881][])
* Restore previous iteration behavior ([#1075][])
* Fix compilation on Linux ([#1077][])
* Align platform versions in SPM manifest and Xcode ([#1094][])
* Revert OSX deployment target back to 10.10 ([#1095][])

0.13.0 (22-08-2021), [diff][diff-0.13.0]
========================================
Expand Down Expand Up @@ -128,3 +130,5 @@
[#919]: https://github.com/stephencelis/SQLite.swift/pull/919
[#1075]: https://github.com/stephencelis/SQLite.swift/pull/1075
[#1077]: https://github.com/stephencelis/SQLite.swift/issues/1077
[#1094]: https://github.com/stephencelis/SQLite.swift/pull/1094
[#1095]: https://github.com/stephencelis/SQLite.swift/pull/1095
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD_TOOL = xcodebuild
BUILD_SCHEME = SQLite Mac
IOS_SIMULATOR = iPhone 12
IOS_VERSION = 14.4
IOS_VERSION = 15.0
ifeq ($(BUILD_SCHEME),SQLite iOS)
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
else
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let package = Package(
name: "SQLite.swift",
platforms: [
.iOS(.v9),
.macOS(.v10_15),
.macOS(.v10_10),
.watchOS(.v3),
.tvOS(.v9)
],
Expand Down
2 changes: 1 addition & 1 deletion SQLite.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pod::Spec.new do |s|

ios_deployment_target = '9.0'
tvos_deployment_target = '9.1'
osx_deployment_target = '10.15'
osx_deployment_target = '10.10'
watchos_deployment_target = '3.0'

s.ios.deployment_target = ios_deployment_target
Expand Down
4 changes: 2 additions & 2 deletions SQLite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "";
Expand Down Expand Up @@ -1304,7 +1304,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "";
SDKROOT = iphoneos;
Expand Down
2 changes: 1 addition & 1 deletion Tests/SPM/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let package = Package(
name: "test",
platforms: [
.iOS(.v9),
.macOS(.v10_15),
.macOS(.v10_10),
.watchOS(.v3),
.tvOS(.v9)
],
Expand Down