Merge pull request #29 from yukiasai/fix/resolve_cocoapods_warning

Resolve the warning of cocoapods.
bannzai · Sep 15, 2016 · c501c54 · c501c54
2 parents 560f83b + 01964d2
commit c501c54
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/Gecco.xcodeproj/project.pbxproj b/Gecco.xcodeproj/project.pbxproj
@@ -216,7 +216,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = yukiasai;
 				TargetAttributes = {
 					467D205C1C48883C0033D5CA = {
@@ -229,6 +229,7 @@
 					};
 					467D20801C488C920033D5CA = {
 						CreatedOnToolsVersion = 7.1.1;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -353,8 +354,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -382,6 +385,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -401,8 +405,10 @@
 				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_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -422,6 +428,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -433,6 +441,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -453,6 +462,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

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

diff --git a/GeccoExample/AnnotationViewController.swift b/GeccoExample/AnnotationViewController.swift
@@ -21,8 +21,8 @@ class AnnotationViewController: SpotlightViewController {
         delegate = self
     }
 
-    func next(labelAnimated: Bool) {
-        updateAnnotationView(animated: labelAnimated)
+    func next(_ labelAnimated: Bool) {
+        updateAnnotationView(labelAnimated)
 
         let screenSize = UIScreen.main.bounds.size
         switch stepIndex {
@@ -43,7 +43,7 @@ class AnnotationViewController: SpotlightViewController {
         stepIndex += 1
     }
 
-    func updateAnnotationView(animated: Bool) {
+    func updateAnnotationView(_ animated: Bool) {
         annotationViews.enumerated().forEach { index, view in
             UIView.animate(withDuration: animated ? 0.25 : 0) {
                 view.alpha = index == self.stepIndex ? 1 : 0
@@ -54,11 +54,11 @@ class AnnotationViewController: SpotlightViewController {
 
 extension AnnotationViewController: SpotlightViewControllerDelegate {
     func spotlightViewControllerWillPresent(_ viewController: SpotlightViewController, animated: Bool) {
-        next(labelAnimated: false)
+        next(false)
     }
 
     func spotlightViewControllerTapped(_ viewController: SpotlightViewController, isInsideSpotlight: Bool) {
-        next(labelAnimated: true)
+        next(true)
     }
 
     func spotlightViewControllerWillDismiss(_ viewController: SpotlightViewController, animated: Bool) {

diff --git a/GeccoExample/AppDelegate.swift b/GeccoExample/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    fileprivate func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [AnyHashable: Any]?) -> Bool {
         UIApplication.shared.statusBarStyle = .lightContent
 
         return true