Updated to Swift 5

SvenTiigi · Apr 2, 2019 · 7a58cc8 · 7a58cc8
1 parent 71804e5
commit 7a58cc8
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 40 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ notifications:
     on_success: change
     on_failure: always
 
-osx_image: xcode10
+osx_image: xcode10.2
 language: swift
 
 cache:

diff --git a/Cartfile b/Cartfile
@@ -1 +1,2 @@
-github "SvenTiigi/FlyoverKit" == 1.2.2
+# FlyoverKit (https://github.com/SvenTiigi/FlyoverKit)
+github "SvenTiigi/FlyoverKit" == 1.3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "SvenTiigi/FlyoverKit" "1.2.2"
+github "SvenTiigi/FlyoverKit" "1.3.0"
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 <h1 align="center">STLocationRequest</h1>
 <p align="center">
     <a href="https://developer.apple.com/swift/">
-        <img src="https://img.shields.io/badge/Swift-4.2-orange.svg?style=flat" alt="Swift 4.2">
+        <img src="https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat" alt="Swift 5.0">
     </a>
     <a href="https://travis-ci.org/SvenTiigi/STLocationRequest">
         <img src="https://travis-ci.org/SvenTiigi/STLocationRequest.svg?branch=master" alt="Build Status">

diff --git a/STLocationRequest.xcodeproj/project.pbxproj b/STLocationRequest.xcodeproj/project.pbxproj
@@ -565,7 +565,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Sven Tiigi";
 				TargetAttributes = {
 					3D4AE38B21F25C5B002D764C = {
@@ -596,7 +596,7 @@
 			};
 			buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "STLocationRequest" */;
 			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -881,7 +881,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "de.tiigi.STLocationRequest.Example-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -909,7 +909,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "de.tiigi.STLocationRequest.Example-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -936,7 +936,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -963,7 +963,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -973,6 +973,7 @@
 			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;
@@ -1032,6 +1033,7 @@
 			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;
@@ -1104,7 +1106,7 @@
 				PRODUCT_NAME = STLocationRequest;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1131,7 +1133,7 @@
 				PRODUCT_NAME = STLocationRequest;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1145,7 +1147,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.STLocationRequest.STLocationRequest-iOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1159,7 +1161,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.STLocationRequest.STLocationRequest-iOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1183,7 +1185,7 @@
 				PRODUCT_NAME = STLocationRequest;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -1210,7 +1212,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -1225,8 +1227,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.STLocationRequest.STLocationRequest-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 4.2;
-				TVOS_DEPLOYMENT_TARGET = 9.1;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
 		};
@@ -1240,8 +1243,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
-				TVOS_DEPLOYMENT_TARGET = 9.1;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
 		};

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

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

diff --git a/Sources/Event/STLocationRequestController+Event.swift b/Sources/Event/STLocationRequestController+Event.swift
@@ -48,6 +48,8 @@ extension CLAuthorizationStatus {
             // Not determined shouldn't be triggered
             // As we request location services
             return nil
+        @unknown default:
+            return .locationRequestDenied
         }
     }
 

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -19,23 +19,42 @@ platform :ios do
 
   desc "Increment Version"
   lane :increment do |options|
-    version = options[:version]
-    version_bump_podspec(path: "STLocationRequest.podspec", version_number: version)
-    set_info_plist_value(path: "Configs/STLocationRequest.plist", key: "CFBundleShortVersionString", value: version)
-    set_info_plist_value(path: "Configs/STLocationRequestTests.plist", key: "CFBundleShortVersionString", value: version)
-    set_info_plist_value(path: "Example-iOS/Resources/Info.plist", key: "CFBundleShortVersionString", value: version)
-    set_info_plist_value(path: "Example-tvOS/Info.plist", key: "CFBundleShortVersionString", value: version)
-    git_commit(
-        path: [
-          "STLocationRequest.podspec", 
-          "Configs/STLocationRequest.plist", 
-          "Configs/STLocationRequestTests.plist", 
-          "Example-iOS/Resources/Info.plist",
-          "Example-tvOS/Info.plist"
-        ],
-        message: "STLocationRequest Version #{version} 🚀"
-    )
-  end
+  version = options[:version]
+  version_bump_podspec(
+    path: "STLocationRequest.podspec", 
+    version_number: version
+  )
+  set_info_plist_value(
+    path: "Configs/STLocationRequest.plist", 
+    key: "CFBundleShortVersionString", 
+    value: version
+  )
+  set_info_plist_value(
+    path: "Configs/STLocationRequestTests.plist", 
+    key: "CFBundleShortVersionString", 
+    value: version
+  )
+  set_info_plist_value(
+    path: "Example-iOS/Resources/Info.plist", 
+    key: "CFBundleShortVersionString", 
+    value: version
+  )
+  set_info_plist_value(
+    path: "Example-tvOS/Info.plist", 
+    key: "CFBundleShortVersionString", 
+    value: version
+  )
+  git_commit(
+      path: [
+        "STLocationRequest.podspec", 
+        "Configs/STLocationRequest.plist", 
+        "Configs/STLocationRequestTests.plist", 
+        "Example-iOS/Resources/Info.plist",
+        "Example-tvOS/Info.plist"
+      ],
+      message: "STLocationRequest Version #{version} 🚀"
+  )
+end
 
   desc "Runs Tests"
   lane :test do
@@ -47,6 +66,12 @@ platform :ios do
       clean: true,
       code_coverage: true
     )
+    scan(
+      project: "STLocationRequest.xcodeproj",
+      scheme: "STLocationRequest-tvOS",
+      clean: true,
+      code_coverage: true
+    )
   end
 
   desc "Runs coverage"