Skip to content

Commit 481b531

Browse files
committed
Run on macOS 12
Bump deployment targets Disable watchOS validation CocoaPods/CocoaPods#11558 Adjust deployment targets for Xcode 14
1 parent d7fe449 commit 481b531

File tree

6 files changed

+38
-24
lines changed

6 files changed

+38
-24
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Build and test
22
on: [push, pull_request]
33
env:
44
IOS_SIMULATOR: iPhone 12
5-
IOS_VERSION: "15.2"
5+
IOS_VERSION: "16.0"
66
jobs:
77
build:
8-
runs-on: macos-11
8+
runs-on: macos-12
99
steps:
1010
- uses: actions/checkout@v2
1111
- name: Install

Package.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import PackageDescription
44
let package = Package(
55
name: "SQLite.swift",
66
platforms: [
7-
.iOS(.v9),
8-
.macOS(.v10_10),
9-
.watchOS(.v3),
10-
.tvOS(.v9)
7+
.iOS(.v11),
8+
.macOS(.v10_13),
9+
.watchOS(.v4),
10+
.tvOS(.v11)
1111
],
1212
products: [
1313
.library(

SQLite.swift.podspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Pod::Spec.new do |s|
1818
s.default_subspec = 'standard'
1919
s.swift_versions = ['5']
2020

21-
ios_deployment_target = '9.0'
22-
tvos_deployment_target = '9.1'
23-
osx_deployment_target = '10.10'
24-
watchos_deployment_target = '3.0'
21+
ios_deployment_target = '11.0'
22+
tvos_deployment_target = '11.0'
23+
osx_deployment_target = '10.13'
24+
watchos_deployment_target = '4.0'
2525

2626
s.ios.deployment_target = ios_deployment_target
2727
s.tvos.deployment_target = tvos_deployment_target

SQLite.xcodeproj/project.pbxproj

+22-8
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,7 @@
12631263
SDKROOT = appletvos;
12641264
SKIP_INSTALL = YES;
12651265
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1266+
TVOS_DEPLOYMENT_TARGET = 11.0;
12661267
};
12671268
name = Debug;
12681269
};
@@ -1284,6 +1285,7 @@
12841285
SDKROOT = appletvos;
12851286
SKIP_INSTALL = YES;
12861287
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1288+
TVOS_DEPLOYMENT_TARGET = 11.0;
12871289
};
12881290
name = Release;
12891291
};
@@ -1297,6 +1299,7 @@
12971299
PRODUCT_NAME = "$(TARGET_NAME)";
12981300
SDKROOT = appletvos;
12991301
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1302+
TVOS_DEPLOYMENT_TARGET = 11.0;
13001303
};
13011304
name = Debug;
13021305
};
@@ -1310,6 +1313,7 @@
13101313
PRODUCT_NAME = "$(TARGET_NAME)";
13111314
SDKROOT = appletvos;
13121315
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
1316+
TVOS_DEPLOYMENT_TARGET = 11.0;
13131317
};
13141318
name = Release;
13151319
};
@@ -1333,6 +1337,7 @@
13331337
SKIP_INSTALL = YES;
13341338
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
13351339
TARGETED_DEVICE_FAMILY = 4;
1340+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
13361341
};
13371342
name = Debug;
13381343
};
@@ -1356,6 +1361,7 @@
13561361
SKIP_INSTALL = YES;
13571362
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
13581363
TARGETED_DEVICE_FAMILY = 4;
1364+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
13591365
};
13601366
name = Release;
13611367
};
@@ -1408,19 +1414,19 @@
14081414
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14091415
GCC_WARN_UNUSED_FUNCTION = YES;
14101416
GCC_WARN_UNUSED_VARIABLE = YES;
1411-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1412-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1417+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1418+
MACOSX_DEPLOYMENT_TARGET = 10.13;
14131419
MTL_ENABLE_DEBUG_INFO = YES;
14141420
ONLY_ACTIVE_ARCH = YES;
14151421
PRODUCT_NAME = "";
14161422
SDKROOT = iphoneos;
14171423
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14181424
SWIFT_VERSION = 5.0;
14191425
TARGETED_DEVICE_FAMILY = "1,2,3";
1420-
TVOS_DEPLOYMENT_TARGET = 9.1;
1426+
TVOS_DEPLOYMENT_TARGET = 11.0;
14211427
VERSIONING_SYSTEM = "apple-generic";
14221428
VERSION_INFO_PREFIX = "";
1423-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
1429+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
14241430
};
14251431
name = Debug;
14261432
};
@@ -1467,19 +1473,19 @@
14671473
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14681474
GCC_WARN_UNUSED_FUNCTION = YES;
14691475
GCC_WARN_UNUSED_VARIABLE = YES;
1470-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1471-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1476+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1477+
MACOSX_DEPLOYMENT_TARGET = 10.13;
14721478
MTL_ENABLE_DEBUG_INFO = NO;
14731479
PRODUCT_NAME = "";
14741480
SDKROOT = iphoneos;
14751481
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
14761482
SWIFT_VERSION = 5.0;
14771483
TARGETED_DEVICE_FAMILY = "1,2,3";
1478-
TVOS_DEPLOYMENT_TARGET = 9.1;
1484+
TVOS_DEPLOYMENT_TARGET = 11.0;
14791485
VALIDATE_PRODUCT = YES;
14801486
VERSIONING_SYSTEM = "apple-generic";
14811487
VERSION_INFO_PREFIX = "";
1482-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
1488+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
14831489
};
14841490
name = Release;
14851491
};
@@ -1496,6 +1502,7 @@
14961502
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
14971503
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
14981504
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1505+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
14991506
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15001507
MARKETING_VERSION = 0.14.0;
15011508
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
@@ -1519,6 +1526,7 @@
15191526
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15201527
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
15211528
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1529+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
15221530
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15231531
MARKETING_VERSION = 0.14.0;
15241532
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
@@ -1533,6 +1541,7 @@
15331541
buildSettings = {
15341542
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15351543
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1544+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
15361545
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15371546
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
15381547
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1545,6 +1554,7 @@
15451554
buildSettings = {
15461555
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
15471556
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1557+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
15481558
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15491559
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
15501560
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1567,6 +1577,7 @@
15671577
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
15681578
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
15691579
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1580+
MACOSX_DEPLOYMENT_TARGET = 10.13;
15701581
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
15711582
PRODUCT_NAME = SQLite;
15721583
SDKROOT = macosx;
@@ -1591,6 +1602,7 @@
15911602
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
15921603
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
15931604
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1605+
MACOSX_DEPLOYMENT_TARGET = 10.13;
15941606
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
15951607
PRODUCT_NAME = SQLite;
15961608
SDKROOT = macosx;
@@ -1608,6 +1620,7 @@
16081620
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
16091621
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
16101622
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1623+
MACOSX_DEPLOYMENT_TARGET = 10.13;
16111624
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
16121625
PRODUCT_NAME = "$(TARGET_NAME)";
16131626
SDKROOT = macosx;
@@ -1623,6 +1636,7 @@
16231636
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
16241637
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
16251638
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1639+
MACOSX_DEPLOYMENT_TARGET = 10.13;
16261640
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
16271641
PRODUCT_NAME = "$(TARGET_NAME)";
16281642
SDKROOT = macosx;

Tests/SPM/Package.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import PackageDescription
66
let package = Package(
77
name: "test",
88
platforms: [
9-
.iOS(.v9),
10-
.macOS(.v10_10),
11-
.watchOS(.v3),
12-
.tvOS(.v9)
9+
.iOS(.v11),
10+
.macOS(.v10_13),
11+
.watchOS(.v4),
12+
.tvOS(.v11)
1313
],
1414
dependencies: [
1515
// for testing from same repository

run-tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ if [ -n "$BUILD_SCHEME" ]; then
88
fi
99
elif [ -n "$VALIDATOR_SUBSPEC" ]; then
1010
if [ "$VALIDATOR_SUBSPEC" == "none" ]; then
11-
pod lib lint --no-subspecs --fail-fast
11+
pod lib lint --no-subspecs --fail-fast --platforms=ios,osx,tvos
1212
else
13-
pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast
13+
pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast --platforms=ios,osx,tvos
1414
fi
1515
elif [ -n "$CARTHAGE_PLATFORM" ]; then
1616
cd Tests/Carthage && make test CARTHAGE_PLATFORM="$CARTHAGE_PLATFORM"

0 commit comments

Comments
 (0)