outware · sharplet · May 25, 2019 · May 25, 2019 · May 25, 2019 · May 25, 2019
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ xcuserdata/
 
 # swiftpm
 /.build
-/Package.pins
 /Package.resolved
 
 # Carthage

diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+5.0.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
-language: objective-c
-osx_image: xcode9.4
+os: osx
+osx_image: xcode10.2
 install:
-  - brew update && brew uninstall --force carthage && brew install carthage
+  - brew bundle
   - gem install xcpretty
-before_script: carthage bootstrap --platform iphoneos
+before_script: carthage bootstrap --platform iOS
 script: rake test:all
diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,2 @@
+# vim: ft=ruby
+brew "carthage"
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "Quick/Quick" ~> 1.1.0
-github "sharplet/Regex" ~> 1.0
+github "Quick/Quick" ~> 2.0
+github "sharplet/Regex" ~> 2.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1 +1 @@
-github "Quick/Nimble" ~> 7.0
+github "Quick/Nimble" ~> 8.0
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -228,7 +228,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Adam Sharp";
 				TargetAttributes = {
 					CE81C84A1BF28C7000DD6AF9 = {
@@ -244,7 +244,7 @@
 			};
 			buildConfigurationList = CE81C8461BF28C7000DD6AF9 /* Build configuration list for PBXProject "Demo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -336,17 +336,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				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;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -383,17 +394,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				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;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -415,6 +437,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "$(ORGANISATION_IDENTIFIER).$(PRODUCT_NAME)";
 				PROJECT_NAME = Demo;
 				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -426,7 +449,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/iOS/Source/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -437,7 +460,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/iOS/Source/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -451,7 +474,7 @@
 				INFOPLIST_FILE = iOS/Features/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(PROJECT_NAME)Features";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Demo-iOS";
 				USES_XCTRUNNER = YES;
 			};
@@ -467,7 +490,7 @@
 				INFOPLIST_FILE = iOS/Features/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(PROJECT_NAME)Features";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Demo-iOS";
 				USES_XCTRUNNER = YES;
 			};

diff --git a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo-iOS.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -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>
diff --git a/Demo/iOS/Features/GreetingFeature.swift b/Demo/iOS/Features/GreetingFeature.swift
@@ -1,5 +1,7 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
+import Scenarios
+
 final class GreetingFeature: Feature {
   override func scenarios() {
 
@@ -18,5 +20,3 @@ final class GreetingFeature: Feature {
 
   }
 }
-
-import Scenarios
diff --git a/Demo/iOS/Features/Steps/AppSteps.swift b/Demo/iOS/Features/Steps/AppSteps.swift
@@ -1,5 +1,9 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
+import Nimble
+import Scenarios
+import XCTest
+
 final class AppSteps: StepDefinition {
   override func steps() {
 
@@ -9,7 +13,3 @@ final class AppSteps: StepDefinition {
 
   }
 }
-
-import Scenarios
-import Nimble
-import XCTest
diff --git a/Demo/iOS/Features/Steps/GreetingSteps.swift b/Demo/iOS/Features/Steps/GreetingSteps.swift
@@ -1,5 +1,9 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
+import Nimble
+import Scenarios
+import XCTest
+
 final class GreetingSteps: StepDefinition {
   override func steps() {
 
@@ -29,7 +33,3 @@ final class GreetingSteps: StepDefinition {
 
   }
 }
-
-import Scenarios
-import Nimble
-import XCTest
diff --git a/Demo/iOS/Source/AppDelegate.swift b/Demo/iOS/Source/AppDelegate.swift
@@ -1,10 +1,8 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
+import UIKit
 
+@UIApplicationMain
+final class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
-
 }
-
-import UIKit
diff --git a/Demo/iOS/Source/GreetingViewController.swift b/Demo/iOS/Source/GreetingViewController.swift
@@ -1,7 +1,8 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
-final class GreetingViewController: UIViewController {
+import UIKit
 
+final class GreetingViewController: UIViewController {
   @IBOutlet var greetingLabel: UILabel!
 
   var subject: String?
@@ -14,7 +15,4 @@ final class GreetingViewController: UIViewController {
     super.viewDidLoad()
     greetingLabel.text = greeting
   }
-
 }
-
-import UIKit
diff --git a/Demo/iOS/Source/ViewController.swift b/Demo/iOS/Source/ViewController.swift
@@ -1,7 +1,8 @@
 //  Copyright © 2015 Adam Sharp. All rights reserved.
 
-class ViewController: UIViewController {
+import UIKit
 
+class ViewController: UIViewController {
   @IBOutlet var nameField: UITextField!
 
   override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -12,7 +13,4 @@ class ViewController: UIViewController {
       break
     }
   }
-
 }
-
-import UIKit
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,16 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
   name: "Scenarios",
+  products: [
+    .library(name: "Scenarios", targets: ["Scenarios"]),
+  ],
   dependencies: [
-    .package(url: "https://github.com/sharplet/Regex.git", from: "1.0.0"),
-    .package(url: "https://github.com/Quick/Quick.git", from: "1.0.0"),
-    .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.0"),
+    .package(url: "https://github.com/sharplet/Regex.git", from: "2.0.0"),
+    .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+    .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
   ],
   targets: [
     .target(
@@ -27,5 +30,5 @@ let package = Package(
       path: "Tests"
     ),
   ],
-  swiftLanguageVersions: [3, 4]
+  swiftLanguageVersions: [.v5]
 )
diff --git a/Package@swift-3.swift b/Package@swift-3.swift
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "Quick/Nimble" ~> 7.0
		github "Quick/Nimble" ~> 8.0