Skip to content

Commit 64542bd

Browse files
JeehutJeehut
committed
Migrate to Xcode 9 and Swift 4
1 parent 608d88c commit 64542bd

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

‎Permission.xcodeproj/project.pbxproj

+19-9
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,16 @@
238238
isa = PBXProject;
239239
attributes = {
240240
LastSwiftUpdateCheck = 0710;
241-
LastUpgradeCheck = 0810;
241+
LastUpgradeCheck = 0900;
242242
ORGANIZATIONNAME = delba;
243243
TargetAttributes = {
244244
6D86A9B11BEBDC7C00E3DD5A = {
245245
CreatedOnToolsVersion = 7.1;
246-
LastSwiftMigration = 0800;
246+
LastSwiftMigration = 0900;
247247
};
248248
6D86A9BB1BEBDC7D00E3DD5A = {
249249
CreatedOnToolsVersion = 7.1;
250-
LastSwiftMigration = 0800;
250+
LastSwiftMigration = 0900;
251251
};
252252
};
253253
};
@@ -345,14 +345,20 @@
345345
CLANG_CXX_LIBRARY = "libc++";
346346
CLANG_ENABLE_MODULES = YES;
347347
CLANG_ENABLE_OBJC_ARC = YES;
348+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
348349
CLANG_WARN_BOOL_CONVERSION = YES;
350+
CLANG_WARN_COMMA = YES;
349351
CLANG_WARN_CONSTANT_CONVERSION = YES;
350352
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
351353
CLANG_WARN_EMPTY_BODY = YES;
352354
CLANG_WARN_ENUM_CONVERSION = YES;
353355
CLANG_WARN_INFINITE_RECURSION = YES;
354356
CLANG_WARN_INT_CONVERSION = YES;
357+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
358+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
355359
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
360+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
361+
CLANG_WARN_STRICT_PROTOTYPES = YES;
356362
CLANG_WARN_SUSPICIOUS_MOVE = YES;
357363
CLANG_WARN_UNREACHABLE_CODE = YES;
358364
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -397,14 +403,20 @@
397403
CLANG_CXX_LIBRARY = "libc++";
398404
CLANG_ENABLE_MODULES = YES;
399405
CLANG_ENABLE_OBJC_ARC = YES;
406+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
400407
CLANG_WARN_BOOL_CONVERSION = YES;
408+
CLANG_WARN_COMMA = YES;
401409
CLANG_WARN_CONSTANT_CONVERSION = YES;
402410
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
403411
CLANG_WARN_EMPTY_BODY = YES;
404412
CLANG_WARN_ENUM_CONVERSION = YES;
405413
CLANG_WARN_INFINITE_RECURSION = YES;
406414
CLANG_WARN_INT_CONVERSION = YES;
415+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
416+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
407417
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
418+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
419+
CLANG_WARN_STRICT_PROTOTYPES = YES;
408420
CLANG_WARN_SUSPICIOUS_MOVE = YES;
409421
CLANG_WARN_UNREACHABLE_CODE = YES;
410422
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -446,13 +458,12 @@
446458
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
447459
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
448460
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
449-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
450461
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
451462
PRODUCT_BUNDLE_IDENTIFIER = io.delba.Permission;
452463
PRODUCT_NAME = Permission;
453464
SKIP_INSTALL = YES;
454465
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
455-
SWIFT_VERSION = 3.0;
466+
SWIFT_VERSION = 4.0;
456467
};
457468
name = Debug;
458469
};
@@ -468,13 +479,12 @@
468479
DYLIB_INSTALL_NAME_BASE = "@rpath";
469480
INFOPLIST_FILE = "Source/Supporting Files/Info.plist";
470481
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
471-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
472482
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
473483
PRODUCT_BUNDLE_IDENTIFIER = io.delba.Permission;
474484
PRODUCT_NAME = Permission;
475485
SKIP_INSTALL = YES;
476486
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
477-
SWIFT_VERSION = 3.0;
487+
SWIFT_VERSION = 4.0;
478488
};
479489
name = Release;
480490
};
@@ -486,7 +496,7 @@
486496
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
487497
PRODUCT_BUNDLE_IDENTIFIER = io.delba.PermissionTests;
488498
PRODUCT_NAME = Permission;
489-
SWIFT_VERSION = 3.0;
499+
SWIFT_VERSION = 4.0;
490500
};
491501
name = Debug;
492502
};
@@ -499,7 +509,7 @@
499509
PRODUCT_BUNDLE_IDENTIFIER = io.delba.PermissionTests;
500510
PRODUCT_NAME = Permission;
501511
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
502-
SWIFT_VERSION = 3.0;
512+
SWIFT_VERSION = 4.0;
503513
};
504514
name = Release;
505515
};

‎Permission.xcodeproj/xcshareddata/xcschemes/Permission.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎Permission.xcodeproj/xcshareddata/xcschemes/PermissionTests.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,6 +10,7 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
language = ""
1314
shouldUseLaunchSchemeArgsEnv = "YES">
1415
<Testables>
1516
<TestableReference
@@ -30,6 +31,7 @@
3031
buildConfiguration = "Debug"
3132
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3233
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
language = ""
3335
launchStyle = "0"
3436
useCustomWorkingDirectory = "NO"
3537
ignoresPersistentStateOnLaunch = "NO"

‎Source/PermissionTypes/Camera.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import AVFoundation
2727

2828
internal extension Permission {
2929
var statusCamera: PermissionStatus {
30-
let status = AVCaptureDevice.authorizationStatus(forMediaType: AVMediaTypeVideo)
30+
let status = AVCaptureDevice.authorizationStatus(for: AVMediaType.video)
3131

3232
switch status {
3333
case .authorized: return .authorized
@@ -42,7 +42,7 @@ internal extension Permission {
4242
return
4343
}
4444

45-
AVCaptureDevice.requestAccess(forMediaType: AVMediaTypeVideo) { _ in
45+
AVCaptureDevice.requestAccess(for: AVMediaType.video) { _ in
4646
callback(self.statusCamera)
4747
}
4848
}

0 commit comments

Comments
 (0)