Update to latest Swift syntax

raphaelhanneken · Oct 9, 2018 · d3ed159 · d3ed159
1 parent abcaa75
commit d3ed159
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/Iconizer.xcodeproj/project.pbxproj b/Iconizer.xcodeproj/project.pbxproj
@@ -256,7 +256,7 @@
 				TargetAttributes = {
 					8E3F8F641B23488F0096E9EC = {
 						CreatedOnToolsVersion = 6.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 						SystemCapabilities = {
 							com.apple.Sandbox = {
 								enabled = 0;
@@ -486,8 +486,7 @@
 				OTHER_LDFLAGS = "-Wl,-rpath,@loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = io.raphaelhanneken.iconizer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -508,8 +507,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.raphaelhanneken.iconizer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Iconizer/Controller/AppIconViewController.swift b/Iconizer/Controller/AppIconViewController.swift
@@ -57,7 +57,7 @@ class AppIconViewController: NSViewController, IconizerViewControllerProtocol {
 
     /// The name of the corresponding nib file.
     override var nibName: NSNib.Name {
-        return NSNib.Name("AppIconView")
+        return "AppIconView"
     }
 
     // MARK: View Controller

diff --git a/Iconizer/Controller/ImageSetViewController.swift b/Iconizer/Controller/ImageSetViewController.swift
@@ -18,7 +18,7 @@ class ImageSetViewController: NSViewController, IconizerViewControllerProtocol {
 
     /// The name of the corresponding nib file.
     override var nibName: NSNib.Name {
-        return NSNib.Name("ImageSetView")
+        return "ImageSetView"
     }
 
     // MARK: Iconizer View Controller

diff --git a/Iconizer/Controller/LaunchImageViewController.swift b/Iconizer/Controller/LaunchImageViewController.swift
@@ -42,7 +42,7 @@ class LaunchImageViewController: NSViewController, IconizerViewControllerProtoco
 
     /// The name of the corresponding nib file.
     override var nibName: NSNib.Name {
-        return NSNib.Name("LaunchImageView")
+        return "LaunchImageView"
     }
 
     // MARK: View Controller

diff --git a/Iconizer/Controller/MainWindowController.swift b/Iconizer/Controller/MainWindowController.swift
@@ -20,7 +20,7 @@ class MainWindowController: NSWindowController, NSWindowDelegate {
 
     // Override the windowNibName property.
     override var windowNibName: NSNib.Name {
-        return NSNib.Name("MainWindow")
+        return "MainWindow"
     }
 
     // MARK: Window delegate

diff --git a/Iconizer/Info.plist b/Iconizer/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>271</string>
+	<string>277</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>