Fix warnings and bump to Swift 5

sebastianvarela · sebastianvarela · commit 5468e9d82d59 · 2019-06-12T12:09:40.000+02:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: swift
+osx_image: xcode10.2
 script:
 - set -o pipefail
 - swift --version
@@ -9,4 +10,4 @@ script:
 - xcodebuild clean build test -project DeviceIdentificator.xcodeproj -scheme DeviceIdentificator-tvOS -destination "platform=tvOS Simulator,name=Apple TV" | xcpretty -f `xcpretty-travis-formatter`
 - bash <(curl -s https://codecov.io/bash) -cF tvOS -J 'DeviceIdentificator'
 - swiftlint lint
-- pod lib lint
+- pod lib lint
diff --git a/DeviceIdentificator.podspec b/DeviceIdentificator.podspec
@@ -9,6 +9,7 @@ Pod::Spec.new do |s|
                    DESC
   s.homepage     = "https://github.com/sebastianvarela/DeviceIdentificator"
   s.license      = { :type => "MIT", :file => "LICENSE" }
+  s.swift_version = '5.0'
 
   s.author             = { "Sebastián Varela" => "sebastian.varela@s3ba.net" }
   s.social_media_url   = "http://twitter.com/skirmish84"
diff --git a/DeviceIdentificator.xcodeproj/project.pbxproj b/DeviceIdentificator.xcodeproj/project.pbxproj
@@ -275,6 +275,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = E2A364EC200D104900668DF9;
 			productRefGroup = E2A364F7200D104900668DF9 /* Products */;
@@ -428,7 +429,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.1;
 			};
@@ -450,7 +450,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.1;
 			};
@@ -467,7 +466,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificatorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 11.4;
 			};
@@ -484,7 +482,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificatorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 11.4;
 			};
@@ -502,7 +499,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificatorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -519,7 +515,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificatorTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -582,6 +577,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -637,6 +633,7 @@
 				PRODUCT_NAME = DeviceIdentificator;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -659,7 +656,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -679,7 +675,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.DeviceIdentificator;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/Source/DeviceModel+Helpers.swift b/Source/DeviceModel+Helpers.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public extension DeviceModel {
-    public var isSimulator: Bool {
+    var isSimulator: Bool {
         switch self {
         case .iPadSimulator, .iPhoneSimulator, .appleTVSimulator:
             return true
@@ -10,15 +10,15 @@ public extension DeviceModel {
         }
     }
 
-    public var isAppleTV: Bool {
+    var isAppleTV: Bool {
         return name.hasPrefix("Apple TV")
     }
 
-    public var isIpad: Bool {
+    var isIpad: Bool {
         return name.hasPrefix("iPad")
     }
 
-    public var isIphone: Bool {
+    var isIphone: Bool {
         return name.hasPrefix("iPhone")
     }
 }
diff --git a/Source/DeviceModel+Name.swift b/Source/DeviceModel+Name.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public extension DeviceModel {
-    public var name: String {
+    var name: String {
         switch self {
         case .iPhone1G: return "iPhone 1G"
         case .iPhone3G: return "iPhone 3G"
diff --git a/Source/UIDeviceExtensions.swift b/Source/UIDeviceExtensions.swift
@@ -1,7 +1,7 @@
 import UIKit
 
 public extension UIDevice {
-    public var deviceModel: DeviceModel {
+    var deviceModel: DeviceModel {
         var systemInfo = utsname()
         uname(&systemInfo)
 
@@ -31,17 +31,17 @@ public extension UIDevice {
     }
 
     @objc
-    public var isIpad: Bool {
+    var isIpad: Bool {
         return deviceModel.isIpad
     }
 
     @objc
-    public var isIphone: Bool {
+    var isIphone: Bool {
         return deviceModel.isIphone
     }
 
     @objc
-    public var isAppleTV: Bool {
+    var isAppleTV: Bool {
         return deviceModel.isAppleTV
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import Foundation`
`2`	`2`
`3`	`3`	`public extension DeviceModel {`
`4`		`- public var isSimulator: Bool {`
	`4`	`+ var isSimulator: Bool {`
`5`	`5`	`switch self {`
`6`	`6`	`case .iPadSimulator, .iPhoneSimulator, .appleTVSimulator:`
`7`	`7`	`return true`
`@@ -10,15 +10,15 @@ public extension DeviceModel {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`- public var isAppleTV: Bool {`
	`13`	`+ var isAppleTV: Bool {`
`14`	`14`	`return name.hasPrefix("Apple TV")`
`15`	`15`	`}`
`16`	`16`
`17`		`- public var isIpad: Bool {`
	`17`	`+ var isIpad: Bool {`
`18`	`18`	`return name.hasPrefix("iPad")`
`19`	`19`	`}`
`20`	`20`
`21`		`- public var isIphone: Bool {`
	`21`	`+ var isIphone: Bool {`
`22`	`22`	`return name.hasPrefix("iPhone")`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import UIKit`
`2`	`2`
`3`	`3`	`public extension UIDevice {`
`4`		`- public var deviceModel: DeviceModel {`
	`4`	`+ var deviceModel: DeviceModel {`
`5`	`5`	`var systemInfo = utsname()`
`6`	`6`	`uname(&systemInfo)`
`7`	`7`
`@@ -31,17 +31,17 @@ public extension UIDevice {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@objc`
`34`		`- public var isIpad: Bool {`
	`34`	`+ var isIpad: Bool {`
`35`	`35`	`return deviceModel.isIpad`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@objc`
`39`		`- public var isIphone: Bool {`
	`39`	`+ var isIphone: Bool {`
`40`	`40`	`return deviceModel.isIphone`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@objc`
`44`		`- public var isAppleTV: Bool {`
	`44`	`+ var isAppleTV: Bool {`
`45`	`45`	`return deviceModel.isAppleTV`
`46`	`46`	`}`
`47`	`47`	`}`