Skip to content

Commit 5794d84

Browse files
authored
Xcode 10 update (#21)
* Update dependencies * Update project to recommended settings * Use compactMap * Update Xcode travis image to 10.1 * Update simulator version to 12.1
1 parent 2afbf6e commit 5794d84

File tree

9 files changed

+16
-14
lines changed

9 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.1
2+
osx_image: xcode10.1
33
env:
44
global:
55
- FRAMEWORK_NAME=SQLiteMigrationManager

Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.0.2"
2-
github "Quick/Quick" "v1.2.0"
3-
github "stephencelis/SQLite.swift" "0.11.4"
1+
github "Quick/Nimble" "v7.3.1"
2+
github "Quick/Quick" "v1.3.2"
3+
github "stephencelis/SQLite.swift" "0.11.5"

Carthage/Checkouts/Nimble

Submodule Nimble updated 105 files

Carthage/Checkouts/Quick

Submodule Quick updated 54 files

SQLiteMigrationManager.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
isa = PBXProject;
175175
attributes = {
176176
LastSwiftUpdateCheck = 0720;
177-
LastUpgradeCheck = 0910;
177+
LastUpgradeCheck = 1010;
178178
ORGANIZATIONNAME = "Vincent Garrigues";
179179
TargetAttributes = {
180180
EBE813E31C4BA00200EE04E8 = {
@@ -266,12 +266,14 @@
266266
CLANG_WARN_BOOL_CONVERSION = YES;
267267
CLANG_WARN_COMMA = YES;
268268
CLANG_WARN_CONSTANT_CONVERSION = YES;
269+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
269270
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
270271
CLANG_WARN_EMPTY_BODY = YES;
271272
CLANG_WARN_ENUM_CONVERSION = YES;
272273
CLANG_WARN_INFINITE_RECURSION = YES;
273274
CLANG_WARN_INT_CONVERSION = YES;
274275
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
276+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
275277
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
276278
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
277279
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -322,12 +324,14 @@
322324
CLANG_WARN_BOOL_CONVERSION = YES;
323325
CLANG_WARN_COMMA = YES;
324326
CLANG_WARN_CONSTANT_CONVERSION = YES;
327+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
325328
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
326329
CLANG_WARN_EMPTY_BODY = YES;
327330
CLANG_WARN_ENUM_CONVERSION = YES;
328331
CLANG_WARN_INFINITE_RECURSION = YES;
329332
CLANG_WARN_INT_CONVERSION = YES;
330333
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
334+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
331335
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
332336
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
333337
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager.xcscheme

Lines changed: 1 addition & 3 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 = "0910"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

SQLiteMigrationManager/SQLiteMigrationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public struct SQLiteMigrationManager {
180180
extension Bundle {
181181
fileprivate func migrations() -> [Migration] {
182182
if let urls = urls(forResourcesWithExtension: "sql", subdirectory: nil) {
183-
return urls.flatMap { FileMigration(url: $0) }
183+
return urls.compactMap { FileMigration(url: $0) }
184184
} else {
185185
return []
186186
}

bin/run-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ main() {
66
xcodebuild \
77
-workspace SQLiteMigrationManager.xcworkspace \
88
-scheme SQLiteMigrationManager\
9-
-sdk iphonesimulator11.1\
10-
-destination "platform=iOS Simulator,name=iPhone X,OS=11.1"\
9+
-sdk iphonesimulator12.1\
10+
-destination "platform=iOS Simulator,name=iPhone X,OS=12.1"\
1111
test
1212
}
1313
main "$@"

0 commit comments

Comments
 (0)