Commit: 72b006520a50aa75212394f4a4ae06eb722451f5 - GoInto (git)

macOSのスクリーンショットの保存場所を変更するメニュバーエクストラ

Commit MetaInfo

• Revision: 72b006520a50aa75212394f4a4ae06eb722451f5 (tree)
• Time: 2017-11-04 23:35:51
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

Swift4に更新

Change Summary

• modified: GoInto.xcodeproj/project.pbxproj
• modified: GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
• modified: GoInto/ChooseFolderItem.swift
• modified: GoInto/FolderItem.swift
• modified: GoInto/ImageTypeItem.swift
• modified: GoInto/QuitItem.swift
• modified: GoInto/StatusBar.swift

Incremental Difference

--- a/GoInto.xcodeproj/project.pbxproj
+++ b/GoInto.xcodeproj/project.pbxproj
@@ -180,7 +180,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Hori,Masaki";
 				TargetAttributes = {
 					F47B06E61E9A5DF9006711D9 = {
@@ -314,7 +314,9 @@
 				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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -322,7 +324,11 @@
 				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_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;
@@ -345,7 +351,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -365,7 +371,9 @@
 				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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -373,7 +381,11 @@
 				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_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;
@@ -390,7 +402,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -406,7 +418,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.GoInto;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -419,7 +431,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.GoInto;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -433,7 +445,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.GoIntoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GoInto.app/Contents/MacOS/GoInto";
 			};
 			name = Debug;
@@ -448,7 +460,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.GoIntoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GoInto.app/Contents/MacOS/GoInto";
 			};
 			name = Release;

--- a/GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
+++ b/GoInto.xcodeproj/xcuserdata/masaki.xcuserdatad/xcschemes/GoInto.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

--- a/GoInto/ChooseFolderItem.swift
+++ b/GoInto/ChooseFolderItem.swift
@@ -20,7 +20,7 @@ extension ActionListener {
         panel.title = NSLocalizedString("Choose Folder", comment: "Choose Folder Open Panel Title")
         panel.message = NSLocalizedString("Choose Folder for Save Screenshot", comment: "Choose Folder Open Panel Message")
         
-        guard panel.runModal() == NSFileHandlingPanelOKButton,
+        guard panel.runModal() == NSApplication.ModalResponse(NSFileHandlingPanelOKButton),
             let url = panel.directoryURL else { return }
         owner.urlSelector(url)
     }

--- a/GoInto/FolderItem.swift
+++ b/GoInto/FolderItem.swift
@@ -30,7 +30,7 @@ final class FolderItem: StatusItem {
             menuItem.title = FileManager.default.displayName(atPath: url.path)
         }
         
-        let work = NSWorkspace.shared()
+        let work = NSWorkspace.shared
         menuItem.image = fitSize(work.icon(forFile: url.path))
         menuItem.action = #selector(ActionListener.changeFolder(_:))
         menuItem.target = listener
@@ -53,7 +53,7 @@ final class FolderItem: StatusItem {
     }
     
     func update(_ url: URL) {
-        menuItem.state = (self.url == url ? NSOnState : NSOffState)
+        menuItem.state = (self.url == url ? .on : .off)
     }
 }
 

--- a/GoInto/ImageTypeItem.swift
+++ b/GoInto/ImageTypeItem.swift
@@ -35,7 +35,7 @@ class ImageTypeItem: StatusItem {
         
         menuItem.title = NSLocalizedString("Image Type", comment: "Image Type MenuItem")
         
-        let ws = NSWorkspace.shared()
+        let ws = NSWorkspace.shared
         menuItem.submenu = NSMenu()
         
         supportTypes
@@ -56,9 +56,9 @@ class ImageTypeItem: StatusItem {
         menuItem.submenu?.items.forEach {
             if let type = $0.representedObject as? String,
                 type == current {
-                $0.state = NSOnState
+                $0.state = .on
             } else {
-                $0.state = NSOffState
+                $0.state = .off
             }
         }
     }

--- a/GoInto/QuitItem.swift
+++ b/GoInto/QuitItem.swift
@@ -10,7 +10,7 @@ import Cocoa
 
 extension ActionListener {
     @IBAction func quit(_ sender: Any?) {
-        NSApplication.shared().terminate(nil)
+        NSApplication.shared.terminate(nil)
     }
 }
 

--- a/GoInto/StatusBar.swift
+++ b/GoInto/StatusBar.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 final class StatusBar: NSObject {
-    let myStatusBar = NSStatusBar.system().statusItem(withLength: NSSquareStatusItemLength)
+    let myStatusBar = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
     let menu = NSMenu()
     private(set) var items: [StatusItem] = []
     private(set) var recentItems = LimitedArray<FolderItem>(5) {