Merge pull request #13 from lemberg/swift-4.2

Update to Swift 4.2
lemberg · Jan 25, 2019 · 8a4832e · 8a4832e
2 parents e5be5c6 + bea6b4d
commit 8a4832e
Show file tree

Hide file tree

Showing 21 changed files with 439 additions and 343 deletions.
diff --git a/Example/Example/Resourses/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Example/Resourses/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -39,6 +39,11 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Example/Example/Sources/Controller/PermissionsController.swift b/Example/Example/Sources/Controller/PermissionsController.swift
@@ -12,7 +12,6 @@ import PermissionsService
 extension PermissionsController: Permissible {}
 
 struct CameraMessages: ServiceMessages {
-
   let deniedTitle = "Access denied"
   let deniedMessage = "You can enable access to camera in Privacy Settings"
   let restrictedTitle = "Access restricted"

diff --git a/Example/PermissionsService.xcodeproj/project.pbxproj b/Example/PermissionsService.xcodeproj/project.pbxproj
@@ -18,7 +18,7 @@
 
 /* Begin PBXFileReference section */
 		115DFF34E5A239BE4C0940D4 /* Pods-PermissionsService_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PermissionsService_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PermissionsService_Tests/Pods-PermissionsService_Tests.debug.xcconfig"; sourceTree = "<group>"; };
-		7ADD5F211D4FBE2FE6881EFF /* PermissionsService.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PermissionsService.podspec; path = ../PermissionsService.podspec; sourceTree = "<group>"; };
+		7ADD5F211D4FBE2FE6881EFF /* PermissionsService.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PermissionsService.podspec; path = ../PermissionsService.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9B01A92F1F2884690056279D /* Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Example.entitlements; sourceTree = "<group>"; };
 		BA644CC018C9CCC2FA10C489 /* Pods-PermissionsService_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PermissionsService_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PermissionsService_Tests/Pods-PermissionsService_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		C9F446DF0721F3104C2FFC11 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -178,7 +178,6 @@
 				DBBDE1A41DACEB3F00E4151F /* Frameworks */,
 				DBBDE1A51DACEB3F00E4151F /* Resources */,
 				30BD0FC9C444F23BD511F7F2 /* [CP] Embed Pods Frameworks */,
-				6AEFD98DFD38C6C924B8C632 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -196,7 +195,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					DBBDE1A61DACEB3F00E4151F = {
@@ -280,21 +279,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6AEFD98DFD38C6C924B8C632 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -338,14 +322,22 @@
 				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;
@@ -386,14 +378,22 @@
 				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;
@@ -439,7 +439,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = permissionsservice.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -461,7 +461,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = permissionsservice.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/...e/PermissionsService.xcodeproj/xcshareddata/xcschemes/PermissionsService-Example.xcscheme b/...e/PermissionsService.xcodeproj/xcshareddata/xcschemes/PermissionsService-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Example/PermissionsService.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/PermissionsService.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/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,24 +1,24 @@
 PODS:
-  - PermissionsService/Camera (0.3.0):
+  - PermissionsService/Camera (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Contacts (0.3.0):
+  - PermissionsService/Contacts (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Core (0.3.0)
-  - PermissionsService/Events (0.3.0):
+  - PermissionsService/Core (0.9.5)
+  - PermissionsService/Events (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Gallery (0.3.0):
+  - PermissionsService/Gallery (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Location (0.3.0):
+  - PermissionsService/Location (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/MediaLibrary (0.3.0):
+  - PermissionsService/MediaLibrary (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Microphone (0.3.0):
+  - PermissionsService/Microphone (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Reminder (0.3.0):
+  - PermissionsService/Reminder (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/Siri (0.3.0):
+  - PermissionsService/Siri (0.9.5):
     - PermissionsService/Core
-  - PermissionsService/SpeechRecognition (0.3.0):
+  - PermissionsService/SpeechRecognition (0.9.5):
     - PermissionsService/Core
 
 DEPENDENCIES:
@@ -35,11 +35,11 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   PermissionsService:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  PermissionsService: 7a70bb00d4bc1f4c800e22afb120d2fc3c86abc7
+  PermissionsService: 1d39fee22ac518ab24582c3d1fd23f7c2b477fee
 
 PODFILE CHECKSUM: 92f3ab47c41087396f2c64bca1e2b996de094b06
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.2
diff --git a/Example/Pods/Local Podspecs/PermissionsService.podspec.json b/Example/Pods/Local Podspecs/PermissionsService.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock