Commit: 5755e6f0c5b4647d89477a15ce9b8898b5869c62 - KanColleBrowserForOSX (git)

Commit MetaInfo

• Revision: 5755e6f0c5b4647d89477a15ce9b8898b5869c62 (tree)
• Zeit: 2018-04-18 22:33:19
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

swift4.3に更新

Ändern Zusammenfassung

• modified: KanColleBrowserForOSX.xcodeproj/project.pbxproj
• modified: KanColleBrowserForOSX/KCBFOMainWindowController.swift

Diff

--- a/KanColleBrowserForOSX.xcodeproj/project.pbxproj
+++ b/KanColleBrowserForOSX.xcodeproj/project.pbxproj
@@ -169,11 +169,11 @@
 				TargetAttributes = {
 					F4EF18AE1B4D36E60021BF8D = {
 						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 0930;
 					};
 					F4EF18BE1B4D36E60021BF8D = {
 						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 0810;
+						LastSwiftMigration = 0930;
 						TestTargetID = F4EF18AE1B4D36E60021BF8D;
 					};
 				};
@@ -389,7 +389,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -402,7 +403,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -423,7 +425,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KanColleBrowserForOSX.app/Contents/MacOS/KanColleBrowserForOSX";
 			};
 			name = Debug;
@@ -441,7 +444,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KanColleBrowserForOSX.app/Contents/MacOS/KanColleBrowserForOSX";
 			};
 			name = Release;

--- a/KanColleBrowserForOSX/KCBFOMainWindowController.swift
+++ b/KanColleBrowserForOSX/KCBFOMainWindowController.swift
@@ -20,7 +20,7 @@ class KCBFOMainWindowController: NSWindowController {
     
     class func makeInstance() -> KCBFOMainWindowController {
         
-        return KCBFOMainWindowController(windowNibName: "KCBFOMainWindowController")
+        return KCBFOMainWindowController(windowNibName: NSNib.Name(rawValue: "KCBFOMainWindowController"))
     }
     
     
@@ -73,6 +73,7 @@ class KCBFOMainWindowController: NSWindowController {
             
                 return
         }
+        
         // ゲームページでない場合はゲームページを表示する
         if let url = webView?.url, url.absoluteString != gamePageURL {
             
@@ -109,7 +110,7 @@ class KCBFOMainWindowController: NSWindowController {
 	
 	func webView(_ sender: WebView!, contextMenuItemsForElement element: [AnyHashable: Any]!, defaultMenuItems: [AnyObject]!) -> [Any]! {
         
-		return defaultMenuItems.flatMap() {
+		return defaultMenuItems.compactMap {
             
 			if ignoreTags.contains($0.tag) {