Updated to swift 5.0

adamthecashew · Jun 24, 2019 · 96d554e · 96d554e
1 parent 4508004
commit 96d554e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/Dobby.xcodeproj/project.pbxproj b/Dobby.xcodeproj/project.pbxproj
@@ -415,7 +415,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "trivago GmbH";
 				TargetAttributes = {
 					DC7F6AF71AD8291800CCBF6D = {
@@ -441,6 +441,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = DC7F6AEE1AD8291800CCBF6D;
@@ -552,6 +553,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCDDA8ED1BED4A7600BB5228 /* Debug.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_TESTABILITY = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -568,11 +574,17 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DCDDA8EF1BED4A7600BB5228 /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.trivago.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
+				SWIFT_COMPILATION_MODE = wholemodule;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -592,7 +604,7 @@
 				);
 				INFOPLIST_FILE = Dobby/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -609,7 +621,7 @@
 				);
 				INFOPLIST_FILE = Dobby/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-iOS.xcscheme b/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
@@ -68,8 +68,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme b/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
@@ -68,8 +68,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Dobby/Info.plist b/Dobby/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.0</string>
+	<string>0.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Dobby/Matcher.swift b/Dobby/Matcher.swift
@@ -22,7 +22,7 @@ public func matches<Value>(_ matches: @escaping (Value) -> Bool) -> Matcher<Valu
 
 public extension Matcher {
     /// Initializes a new matcher that matches anything.
-    public init() {
+    init() {
         self.init(description: "_") { _ in true }
     }
 }
@@ -65,7 +65,7 @@ public func some<M: MatcherConvertible>(_ matcher: M) -> Matcher<M.ValueType?> {
 
 public extension Matcher where Value: Equatable {
     /// Initializes a new matcher that matches the given value.
-    public init(value: Value) {
+    init(value: Value) {
         self.init(description: "\(value)") { actualValue in
             return value == actualValue
         }

diff --git a/Dobby/Stub.swift b/Dobby/Stub.swift
@@ -47,7 +47,7 @@ public final class Stub<Interaction, ReturnValue> {
         behaviors.append((identifier: identifier, behavior: behavior))
 
         return Disposable { [weak self] in
-            let index = self?.behaviors.index { otherIdentifier, _ in
+            let index = self?.behaviors.firstIndex { otherIdentifier, _ in
                 return otherIdentifier == identifier
             }