Fix compile errors with Swift 5 (p2#313)

Thanks! This also fixes p2#311

Author: drdavec

OAuth2.xcodeproj/project.pbxproj

@@ -590,6 +590,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -910,7 +911,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -961,7 +962,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				METAL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 4.0;

README.md

@@ -12,7 +12,7 @@ OAuth2 frameworks for **macOS**, **iOS** and **tvOS** written in Swift 4.2.
 - [📱 Sample iOS app](https://github.com/p2/OAuth2PodApp) (using CocoaPods)
 - [📖 Technical Documentation](https://p2.github.io/OAuth2)
 
-OAuth2 requires Xcode 8, the built framework can be used on **OS X 10.9** or **iOS 8** and later.
+OAuth2 requires Xcode 8, the built framework can be used on **OS X 10.11** or **iOS 8** and later.
 Happy to accept pull requests, please see [CONTRIBUTING.md](./CONTRIBUTING.md)
 
 ### Swift Version

Sources/Base/OAuth2Error.swift

@@ -338,7 +338,7 @@ public extension Error {
 	/**
 	Convenience getter to easily retrieve an OAuth2Error from any Error.
 	*/
-	public var asOAuth2Error: OAuth2Error {
+	var asOAuth2Error: OAuth2Error {
 		if let oaerror = self as? OAuth2Error {
 			return oaerror
 		}

Sources/Base/OAuth2Logger.swift

@@ -99,17 +99,17 @@ extension OAuth2Logger {
 
 	/** Log a message at the trace level. */
 	public func trace(_ module: String? = "OAuth2", filename: String? = #file, line: Int? = #line, function: String? = #function, msg: @autoclosure() -> String) {
-		log(.trace, module: module, filename: filename, line: line, function: function, msg: msg)
+		log(.trace, module: module, filename: filename, line: line, function: function, msg: msg())
 	}
 
 	/** Standard debug logging. */
 	public func debug(_ module: String? = "OAuth2", filename: String? = #file, line: Int? = #line, function: String? = #function, msg: @autoclosure() -> String) {
-		log(.debug, module: module, filename: filename, line: line, function: function, msg: msg)
+		log(.debug, module: module, filename: filename, line: line, function: function, msg: msg())
 	}
 
 	/** Log warning messages. */
 	public func warn(_ module: String? = "OAuth2", filename: String? = #file, line: Int? = #line, function: String? = #function, msg: @autoclosure() -> String) {
-		log(.warn, module: module, filename: filename, line: line, function: function, msg: msg)
+		log(.warn, module: module, filename: filename, line: line, function: function, msg: msg())
 	}
 }
 

p2.OAuth2.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.cocoapods_version = '>= 1.4.0'
 
   s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.10'
+  s.osx.deployment_target = '10.11'
   s.tvos.deployment_target = '9.0'
   s.pod_target_xcconfig = {
     'OTHER_SWIFT_FLAGS' => '-DNO_MODULE_IMPORT -DNO_KEYCHAIN_IMPORT'