Port code to Swift 5.

objecthub · objecthub · commit 27eaed61aac6 · 2019-03-30T22:34:50.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3 (2019-03-30)
+- Migrated library to Xcode 10.2
+- Ported code to Swift 5
+
 ## 0.2 (2018-06-10)
 - Bug fixes
 - Support of usage descriptions
diff --git a/CommandLineKit.xcodeproj/project.pbxproj b/CommandLineKit.xcodeproj/project.pbxproj
@@ -284,11 +284,11 @@
 					};
 					CCFC2AD2207A636B00EDDADD = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 					CCFC2AEB207A69B900EDDADD = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -298,6 +298,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = CC7A60DF207A62A5007376A0;
 			productRefGroup = CC7A60E8207A62A5007376A0 /* Products */;
@@ -432,7 +433,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -479,7 +480,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -565,7 +566,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -614,7 +615,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -654,7 +655,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -692,7 +693,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Package.swift b/Package.swift
@@ -1,16 +1,16 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 //
 //  Package.swift
 //  CommandLineKit
 //
 //  Build targets by calling the Swift Package Manager in the following way for debug purposes:
-//  swift build -Xswiftc "-target" -Xswiftc "x86_64-apple-macosx10.11"
+//  swift build
 //
 //  A release can be built with these options:
-//  swift build -c release -Xswiftc -static-stdlib -Xswiftc "-target" -Xswiftc "x86_64-apple-macosx10.11"
+//  swift build -c release
 //
 //  Created by Matthias Zenger on 06/05/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -42,6 +42,9 @@ import PackageDescription
 
 let package = Package(
   name: "CommandLineKit",
+  platforms: [
+    .macOS(.v10_12)
+  ],
   products: [
     .library(name: "CommandLineKit", targets: ["CommandLineKit"]),
     .executable(name: "CommandLineKitDemo", targets: ["CommandLineKitDemo"])
@@ -57,5 +60,5 @@ let package = Package(
     .testTarget(name: "CommandLineKitTests",
                 dependencies: ["CommandLineKit"])
   ],
-  swiftLanguageVersions: [.v4_2]
+  swiftLanguageVersions: [.v5]
 )
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![Platform: macOS](https://img.shields.io/badge/Platform-macOS-blue.svg?style=flat)](https://developer.apple.com/osx/)
 [![Platform: Linux](https://img.shields.io/badge/Platform-Linux-blue.svg?style=flat)](https://www.ubuntu.com/)
-[![Language: Swift 4.2](https://img.shields.io/badge/Language-Swift%204.2-green.svg?style=flat)](https://developer.apple.com/swift/)
-[![IDE: Xcode 10.0](https://img.shields.io/badge/IDE-Xcode%2010.0-orange.svg?style=flat)](https://developer.apple.com/xcode/)
+[![Language: Swift 5](https://img.shields.io/badge/Language-Swift%205-green.svg?style=flat)](https://developer.apple.com/swift/)
+[![IDE: Xcode 10.2](https://img.shields.io/badge/IDE-Xcode%2010.2-orange.svg?style=flat)](https://developer.apple.com/xcode/)
 [![Carthage: compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License: BSD](https://img.shields.io/badge/License-BSD-lightgrey.svg?style=flat)](https://developers.google.com/open-source/licenses/bsd)
 
@@ -197,7 +197,7 @@ if let ln = LineReader() {
 
 ## Requirements
 
-- [Xcode 10.0](https://developer.apple.com/xcode/)
-- [Swift 4.2](https://developer.apple.com/swift/)
+- [Xcode 10.2](https://developer.apple.com/xcode/)
+- [Swift 5](https://developer.apple.com/swift/)
 - [Carthage](https://github.com/Carthage/Carthage)
 - [Swift Package Manager](https://swift.org/package-manager/)
diff --git a/Sources/CommandLineKit/AnsiCodes.swift b/Sources/CommandLineKit/AnsiCodes.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/BackgroundColor.swift b/Sources/CommandLineKit/BackgroundColor.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 18/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/CommandLineKit.h b/Sources/CommandLineKit/CommandLineKit.h
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 08/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/ControlCharacters.swift b/Sources/CommandLineKit/ControlCharacters.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/ConvertibleFromString.swift b/Sources/CommandLineKit/ConvertibleFromString.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 26/03/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/EditState.swift b/Sources/CommandLineKit/EditState.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/Flag.swift b/Sources/CommandLineKit/Flag.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 25/03/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/FlagError.swift b/Sources/CommandLineKit/FlagError.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 25/03/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/Flags.swift b/Sources/CommandLineKit/Flags.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 25/03/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/Info.plist b/Sources/CommandLineKit/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.2</string>
+	<string>0.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 Google LLC</string>
+	<string>Copyright © 2018-2019 Google LLC</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/Sources/CommandLineKit/LineReader.swift b/Sources/CommandLineKit/LineReader.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/LineReaderError.swift b/Sources/CommandLineKit/LineReaderError.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/LineReaderHistory.swift b/Sources/CommandLineKit/LineReaderHistory.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/Terminal.swift b/Sources/CommandLineKit/Terminal.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 19/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Sources/CommandLineKit/TextColor.swift b/Sources/CommandLineKit/TextColor.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 07/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKit/TextProperties.swift b/Sources/CommandLineKit/TextProperties.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 18/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
@@ -170,10 +170,11 @@ public struct TextProperties: Hashable {
                           backgroundColor: backgroundColor,
                           textStyles: styles)
   }
-  
-  public var hashValue: Int {
-    return (((self.textColor?.hashValue ?? 0) &* 31) + self.textStyles.hashValue) &* 31 +
-           (self.backgroundColor?.hashValue ?? 0)
+
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(self.textColor)
+    hasher.combine(self.textStyles)
+    hasher.combine(self.backgroundColor)
   }
   
   public static func == (lhs: TextProperties, rhs: TextProperties) -> Bool {
diff --git a/Sources/CommandLineKit/TextStyle.swift b/Sources/CommandLineKit/TextStyle.swift
@@ -3,7 +3,7 @@
 //  CommandLineKit
 //
 //  Created by Matthias Zenger on 18/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKitDemo/LinuxMain.swift b/Sources/CommandLineKitDemo/LinuxMain.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitDemo
 //
 //  Created by Matthias Zenger on 02/06/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Sources/CommandLineKitDemo/main.swift b/Sources/CommandLineKitDemo/main.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitDemo
 //
 //  Created by Matthias Zenger on 08/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Tests/CommandLineKitTests/AnsiCodesTests.swift b/Tests/CommandLineKitTests/AnsiCodesTests.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitTests
 //
 //  Created by Matthias Zenger on 08/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Tests/CommandLineKitTests/EditStateTests.swift b/Tests/CommandLineKitTests/EditStateTests.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitTests
 //
 //  Created by Matthias Zenger on 08/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Tests/CommandLineKitTests/FlagTests.swift b/Tests/CommandLineKitTests/FlagTests.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitTests
 //
 //  Created by Matthias Zenger on 25/03/2017.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
diff --git a/Tests/CommandLineKitTests/LineReaderHistoryTests.swift b/Tests/CommandLineKitTests/LineReaderHistoryTests.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitTests
 //
 //  Created by Matthias Zenger on 08/04/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //  Copyright © 2017 Andy Best <andybest.net at gmail dot com>
 //  Copyright © 2010-2014 Salvatore Sanfilippo <antirez at gmail dot com>
 //  Copyright © 2010-2013 Pieter Noordhuis <pcnoordhuis at gmail dot com>
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -3,7 +3,7 @@
 //  CommandLineKitTests
 //
 //  Created by Matthias Zenger on 02/06/2018.
-//  Copyright © 2018 Google LLC
+//  Copyright © 2018-2019 Google LLC
 //
 //  Redistribution and use in source and binary forms, with or without
 //  modification, are permitted provided that the following conditions are met:
