Skip to content

Commit 8e35821

Browse files
jberkeljberkel
authored
Merge pull request #1051 from BennettSmith/master
Updates for Xcode 12.5
2 parents 70fb7af + f961db5 commit 8e35821

File tree

12 files changed

+141
-80
lines changed

12 files changed

+141
-80
lines changed

‎.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: objective-c
2-
rvm: 2.3
2+
rvm: 2.6
33
# https://docs.travis-ci.com/user/reference/osx
4-
osx_image: xcode10.2
4+
osx_image: xcode12.5
55
env:
66
global:
77
- IOS_SIMULATOR="iPhone XS"
8-
- IOS_VERSION="12.2"
8+
- IOS_VERSION="12.4"
99
matrix:
1010
include:
1111
- env: BUILD_SCHEME="SQLite iOS"
@@ -25,7 +25,7 @@ before_install:
2525
- brew update
2626
- brew outdated carthage || brew upgrade carthage
2727
script:
28-
# Workaround for Xcode 10.2/tvOS 9.1 bug
28+
# Workaround for Xcode 10.2/tvOS 9.1 bug (This is an outdated workaround; commenting out.)
2929
# See https://stackoverflow.com/questions/55389080/xcode-10-2-failed-to-run-app-on-simulator-with-ios-10
30-
- sudo mkdir /Library/Developer/CoreSimulator/Profiles/Runtimes/tvOS\ 9.1.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift
30+
# - sudo mkdir /Library/Developer/CoreSimulator/Profiles/Runtimes/tvOS\ 9.1.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift
3131
- ./run-tests.sh

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
0.12.3 (18-05-2021), [diff][diff-0.12.2]
2+
========================================
3+
4+
* Swift 5.3 support.
5+
* Xcode 12.5 support.
6+
* Bumps minimum deployment versions.
7+
* Fixes up Package.swift to build SQLiteObjc module.
8+
19
0.11.6 (xxx), [diff][diff-0.11.6]
210
========================================
311

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
33
IOS_SIMULATOR = iPhone XS
4-
IOS_VERSION = 12.2
4+
IOS_VERSION = 12.4
55
ifeq ($(BUILD_SCHEME),SQLite iOS)
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
77
else

‎Package.swift

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,46 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.3
22
import PackageDescription
33

44
let package = Package(
55
name: "SQLite.swift",
6-
products: [.library(name: "SQLite", targets: ["SQLite"])],
6+
products: [
7+
.library(
8+
name: "SQLite",
9+
targets: ["SQLite"]
10+
)
11+
],
712
targets: [
8-
.target(name: "SQLite", dependencies: ["SQLiteObjc"]),
9-
.target(name: "SQLiteObjc"),
10-
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
11-
],
12-
swiftLanguageVersions: [4, 5]
13+
.target(
14+
name: "SQLite",
15+
dependencies: ["SQLiteObjc"],
16+
exclude: [
17+
"Info.plist"
18+
]
19+
),
20+
.target(
21+
name: "SQLiteObjc",
22+
dependencies: [],
23+
exclude: [
24+
"SQLiteObjc.h",
25+
"fts3_tokenizer.h",
26+
"include/README.md"
27+
]
28+
),
29+
.testTarget(
30+
name: "SQLiteTests",
31+
dependencies: [
32+
"SQLite"
33+
],
34+
path: "Tests/SQLiteTests",
35+
exclude: [
36+
"Info.plist"
37+
],
38+
resources: [
39+
.copy("fixtures/encrypted-3.x.sqlite"),
40+
.copy("fixtures/encrypted-4.x.sqlite")
41+
]
42+
)
43+
]
1344
)
1445

1546
#if os(Linux)

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
EE247B911C3F822500AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
278278
EE247B921C3F822600AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
279279
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = SQLite.swift.podspec; sourceTree = "<group>"; };
280-
EE91808D1C46E5230038162A /* SQLiteObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLiteObjc.h; path = ../../SQLiteObjc/include/SQLiteObjc.h; sourceTree = "<group>"; };
280+
EE91808D1C46E5230038162A /* SQLiteObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLiteObjc.h; path = ../../SQLiteObjc/SQLiteObjc.h; sourceTree = "<group>"; };
281281
EE9180911C46E9D30038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
282282
EE9180931C46EA210038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
283283
/* End PBXFileReference section */
@@ -680,7 +680,7 @@
680680
isa = PBXProject;
681681
attributes = {
682682
LastSwiftUpdateCheck = 0720;
683-
LastUpgradeCheck = 1020;
683+
LastUpgradeCheck = 1250;
684684
TargetAttributes = {
685685
03A65E591C6BB0F50062603F = {
686686
CreatedOnToolsVersion = 7.2;
@@ -1033,7 +1033,7 @@
10331033
PRODUCT_NAME = SQLite;
10341034
SDKROOT = appletvos;
10351035
SKIP_INSTALL = YES;
1036-
TVOS_DEPLOYMENT_TARGET = 9.1;
1036+
TVOS_DEPLOYMENT_TARGET = 12.0;
10371037
};
10381038
name = Debug;
10391039
};
@@ -1053,7 +1053,7 @@
10531053
PRODUCT_NAME = SQLite;
10541054
SDKROOT = appletvos;
10551055
SKIP_INSTALL = YES;
1056-
TVOS_DEPLOYMENT_TARGET = 9.1;
1056+
TVOS_DEPLOYMENT_TARGET = 12.0;
10571057
};
10581058
name = Release;
10591059
};
@@ -1065,7 +1065,7 @@
10651065
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10661066
PRODUCT_NAME = "$(TARGET_NAME)";
10671067
SDKROOT = appletvos;
1068-
TVOS_DEPLOYMENT_TARGET = 9.1;
1068+
TVOS_DEPLOYMENT_TARGET = 12.0;
10691069
};
10701070
name = Debug;
10711071
};
@@ -1077,7 +1077,7 @@
10771077
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10781078
PRODUCT_NAME = "$(TARGET_NAME)";
10791079
SDKROOT = appletvos;
1080-
TVOS_DEPLOYMENT_TARGET = 9.1;
1080+
TVOS_DEPLOYMENT_TARGET = 12.0;
10811081
};
10821082
name = Release;
10831083
};
@@ -1148,6 +1148,7 @@
11481148
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11491149
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11501150
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1151+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
11511152
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
11521153
CLANG_WARN_STRICT_PROTOTYPES = YES;
11531154
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1173,8 +1174,8 @@
11731174
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11741175
GCC_WARN_UNUSED_FUNCTION = YES;
11751176
GCC_WARN_UNUSED_VARIABLE = YES;
1176-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1177-
MACOSX_DEPLOYMENT_TARGET = 10.9;
1177+
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
1178+
MACOSX_DEPLOYMENT_TARGET = 10.15;
11781179
MTL_ENABLE_DEBUG_INFO = YES;
11791180
ONLY_ACTIVE_ARCH = YES;
11801181
PRODUCT_NAME = "";
@@ -1210,6 +1211,7 @@
12101211
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12111212
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12121213
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1214+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12131215
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12141216
CLANG_WARN_STRICT_PROTOTYPES = YES;
12151217
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1229,8 +1231,8 @@
12291231
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12301232
GCC_WARN_UNUSED_FUNCTION = YES;
12311233
GCC_WARN_UNUSED_VARIABLE = YES;
1232-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1233-
MACOSX_DEPLOYMENT_TARGET = 10.9;
1234+
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
1235+
MACOSX_DEPLOYMENT_TARGET = 10.15;
12341236
MTL_ENABLE_DEBUG_INFO = NO;
12351237
PRODUCT_NAME = "";
12361238
SDKROOT = iphoneos;
@@ -1255,7 +1257,6 @@
12551257
DYLIB_INSTALL_NAME_BASE = "@rpath";
12561258
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
12571259
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1258-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12591260
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12601261
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
12611262
PRODUCT_NAME = SQLite;
@@ -1276,7 +1277,6 @@
12761277
DYLIB_INSTALL_NAME_BASE = "@rpath";
12771278
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
12781279
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1279-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12801280
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12811281
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
12821282
PRODUCT_NAME = SQLite;
@@ -1288,7 +1288,6 @@
12881288
isa = XCBuildConfiguration;
12891289
buildSettings = {
12901290
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1291-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12921291
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12931292
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12941293
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1299,7 +1298,6 @@
12991298
isa = XCBuildConfiguration;
13001299
buildSettings = {
13011300
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
1302-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
13031301
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13041302
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13051303
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1320,7 +1318,6 @@
13201318
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
13211319
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13221320
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1323-
MACOSX_DEPLOYMENT_TARGET = 10.10;
13241321
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
13251322
PRODUCT_NAME = SQLite;
13261323
SDKROOT = macosx;
@@ -1343,7 +1340,6 @@
13431340
INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist";
13441341
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13451342
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1346-
MACOSX_DEPLOYMENT_TARGET = 10.10;
13471343
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLite;
13481344
PRODUCT_NAME = SQLite;
13491345
SDKROOT = macosx;
@@ -1359,7 +1355,6 @@
13591355
COMBINE_HIDPI_IMAGES = YES;
13601356
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
13611357
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1362-
MACOSX_DEPLOYMENT_TARGET = 10.10;
13631358
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13641359
PRODUCT_NAME = "$(TARGET_NAME)";
13651360
SDKROOT = macosx;
@@ -1373,7 +1368,6 @@
13731368
COMBINE_HIDPI_IMAGES = YES;
13741369
INFOPLIST_FILE = Tests/SQLiteTests/Info.plist;
13751370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1376-
MACOSX_DEPLOYMENT_TARGET = 10.10;
13771371
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13781372
PRODUCT_NAME = "$(TARGET_NAME)";
13791373
SDKROOT = macosx;

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
34+
BuildableName = "SQLite.framework"
35+
BlueprintName = "SQLite Mac"
36+
ReferencedContainer = "container:SQLite.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12"
46-
BuildableName = "SQLite.framework"
47-
BlueprintName = "SQLite Mac"
48-
ReferencedContainer = "container:SQLite.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:SQLite.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
34+
BuildableName = "SQLite.framework"
35+
BlueprintName = "SQLite iOS"
36+
ReferencedContainer = "container:SQLite.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12"
46-
BuildableName = "SQLite.framework"
47-
BlueprintName = "SQLite iOS"
48-
ReferencedContainer = "container:SQLite.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:SQLite.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

0 commit comments

Comments
 (0)