Swift 4.2

onmyway133 · Jan 24, 2019 · b2505d6 · b2505d6
1 parent 8470ed9
commit b2505d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/FinderGo.xcodeproj/project.pbxproj b/FinderGo.xcodeproj/project.pbxproj
@@ -511,6 +511,7 @@
  SDKROOT = macosx;
  SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 4.2;
  };
  name = Debug;
  };
@@ -560,6 +561,7 @@
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = macosx;
  SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 4.2;
  };
  name = Release;
  };
@@ -574,7 +576,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGo;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
@@ -589,7 +590,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGo;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  };
  name = Release;
  };
@@ -603,7 +603,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGoTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FinderGo.app/Contents/MacOS/FinderGo";
  };
  name = Debug;
@@ -618,7 +617,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGoTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FinderGo.app/Contents/MacOS/FinderGo";
  };
  name = Release;
@@ -632,7 +630,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGoUITests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  TEST_TARGET_NAME = FinderGo;
  };
  name = Debug;
@@ -646,7 +643,6 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGoUITests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
  TEST_TARGET_NAME = FinderGo;
  };
  name = Release;
@@ -662,7 +658,6 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGo.FinderSyncExtension;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
@@ -677,7 +672,6 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.FinderGo.FinderSyncExtension;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
  };
  name = Release;
  };

diff --git a/FinderGo/ViewController.swift b/FinderGo/ViewController.swift
@@ -17,7 +17,7 @@ class ViewController: NSViewController {
  worker.run()
 
  DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
- NSApplication.shared().terminate(self)
+ NSApplication.shared.terminate(self)
  }
  }
 }

diff --git a/FinderSyncExtension/ExtensionWorker.swift b/FinderSyncExtension/ExtensionWorker.swift
@@ -58,7 +58,7 @@ struct ExtensionWorker {
  panel.message = "Please select the User > Library > Application Scripts > \(bundle) folder"
 
  panel.begin { result in
- guard result == NSFileHandlingPanelOKButton,
+ guard result.rawValue == NSFileHandlingPanelOKButton,
  panel.url == self.scriptPath else {
 
  self.alert(message: "Script folder was not selected")

diff --git a/FinderSyncExtension/FinderSync.swift b/FinderSyncExtension/FinderSync.swift
@@ -67,8 +67,8 @@ class FinderSync: FIFinderSync, NSMenuDelegate {
  return
  }
 
- let board = NSPasteboard.general()
- board.setString(targetedUrl.path, forType: NSPasteboardTypeString)
+ let board = NSPasteboard.general
+ board.setString(targetedUrl.path, forType: NSPasteboard.PasteboardType.string)
  }
 
  // MARK: - Action