Skip to content

Commit

Permalink
Upgrade project to Xcode 9.4/Swift 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@renssies
renssies committed Jul 5, 2018
1 parent 62e1799 commit 440be71
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
12 changes: 5 additions & 7 deletions Trekker.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Rens Verhoeven";
TargetAttributes = {
0C7FAD091BECBE8C0049C011 = {
Expand Down Expand Up @@ -455,12 +455,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -508,12 +510,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -554,7 +558,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "co.awkward.trekker-example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
Expand All @@ -570,7 +573,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "co.awkward.trekker-example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
Expand All @@ -595,7 +597,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -621,7 +622,6 @@
PRODUCT_BUNDLE_IDENTIFIER = co.awkward.trekker;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -635,7 +635,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "co.awkward.trekker-tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
Expand All @@ -647,7 +646,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "co.awkward.trekker-tests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
Expand Down
8 changes: 8 additions & 0 deletions Trekker.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 1 addition & 3 deletions Trekker.xcodeproj/xcshareddata/xcschemes/Trekker.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 1 addition & 3 deletions Trekker.xcodeproj/xcshareddata/xcschemes/TrekkerExample.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
10 changes: 5 additions & 5 deletions Trekker/Trekker.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ extension Trekker {

/// The services that implement the `TrekkerEventAnalytics` protocol.
private var servicesForEventTracking: [TrekkerEventAnalytics] {
return self.services.flatMap { (service) -> TrekkerEventAnalytics? in
return self.services.compactMap { (service) -> TrekkerEventAnalytics? in
return service as? TrekkerEventAnalytics
}
}
Expand Down Expand Up @@ -195,7 +195,7 @@ extension Trekker {

/// The services that implement the `TrekkerTimedEventAnalytics` protocol.
private var servicesForTimedEventTracking: [TrekkerTimedEventAnalytics] {
return self.services.flatMap({ (service) -> TrekkerTimedEventAnalytics? in
return self.services.compactMap({ (service) -> TrekkerTimedEventAnalytics? in
return service as? TrekkerTimedEventAnalytics
})
}
Expand Down Expand Up @@ -228,7 +228,7 @@ extension Trekker {

/// The services that implement the `TrekkerEventSuperPropertiesAnalytics` protocol.
private var servicesForEventSuperProperties: [TrekkerEventSuperPropertiesAnalytics] {
return self.services.flatMap({ (service) -> TrekkerEventSuperPropertiesAnalytics? in
return self.services.compactMap({ (service) -> TrekkerEventSuperPropertiesAnalytics? in
return service as? TrekkerEventSuperPropertiesAnalytics
})
}
Expand Down Expand Up @@ -258,7 +258,7 @@ extension Trekker {

/// The services that implement the `TrekkerPushNotificationAnalytics` protocol.
private var servicesForPushNotifications: [TrekkerPushNotificationAnalytics] {
return self.services.flatMap { (service) -> TrekkerPushNotificationAnalytics? in
return self.services.compactMap { (service) -> TrekkerPushNotificationAnalytics? in
return service as? TrekkerPushNotificationAnalytics
}
}
Expand Down Expand Up @@ -290,7 +290,7 @@ extension Trekker {

/// The services that implement the `TrekkerUserProfileAnalytics` protocol.
private var servicesForUserProfiles: [TrekkerUserProfileAnalytics] {
return self.services.flatMap { (service) -> TrekkerUserProfileAnalytics? in
return self.services.compactMap { (service) -> TrekkerUserProfileAnalytics? in
return service as? TrekkerUserProfileAnalytics
}
}
Expand Down

0 comments on commit 440be71

Please sign in to comment.