2.0 RC1

dmlogv · Apr 8, 2018 · 73af9b5 · 73af9b5
1 parent 8006dc3
commit 73af9b5
Show file tree

Hide file tree

Showing 27 changed files with 689 additions and 28 deletions.
diff --git a/Fluor.xcodeproj/project.pbxproj b/Fluor.xcodeproj/project.pbxproj
@@ -23,7 +23,6 @@
 		3F5F57582016249E002AF4C1 /* RunningAppWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F5F57572016249E002AF4C1 /* RunningAppWindowController.swift */; };
 		3F697A0C1F88D47C007BA558 /* MoverEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F697A0B1F88D47C007BA558 /* MoverEffectView.swift */; };
 		3F6D52C32058737F00517E57 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F6D52C22058737F00517E57 /* HockeySDK.framework */; };
-		3F6D52C4205875BB00517E57 /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F6D52C22058737F00517E57 /* HockeySDK.framework */; };
 		3F6D52C5205875BB00517E57 /* HockeySDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F6D52C22058737F00517E57 /* HockeySDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3F6D52C7205BC82B00517E57 /* KeepSafe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F6D52C6205BC82B00517E57 /* KeepSafe.swift */; };
 		3F6D52CA2069659800517E57 /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F6D52C82069659800517E57 /* About.storyboard */; };
@@ -58,6 +57,8 @@
 		3FE7E0E31D7CBE1700DC754D /* AboutWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E11D7CBE1700DC754D /* AboutWindowController.swift */; };
 		3FE7E0EA1D7CC01B00DC754D /* RulesEditorWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E81D7CC01B00DC754D /* RulesEditorWindowController.swift */; };
 		3FF2410B1EDB4E0000E524CD /* SwitchMethodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FF2410A1EDB4E0000E524CD /* SwitchMethodViewController.swift */; };
+		3FF655C7207501AF00C8D2FC /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 3FF655C6207501AF00C8D2FC /* dsa_pub.pem */; };
+		3FF655CA20751D1600C8D2FC /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FF655C820751D1600C8D2FC /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -98,7 +99,7 @@
 		3F6D52CB2069667300517E57 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
 		3F6D52CD20696E2100517E57 /* LinkButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkButton.swift; sourceTree = "<group>"; };
 		3F719FDD1FE798600083E7F7 /* SwitchMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchMenuItem.swift; sourceTree = "<group>"; };
-		3F7291ED2025BD1E005C9B70 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Fluor/Sparkle.framework; sourceTree = "<group>"; };
+		3F7291ED2025BD1E005C9B70 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../Utils/Sparkle/Sparkle.framework; sourceTree = "<group>"; };
 		3F7291F12028BC6B005C9B70 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
 		3F7C349B1ED5EBAA0020C538 /* BehaviorController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BehaviorController.swift; sourceTree = "<group>"; };
 		3F84FE80200E655E00871275 /* StoryboardInstantiableProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardInstantiableProtocol.swift; sourceTree = "<group>"; };
@@ -129,6 +130,9 @@
 		3FE7E0E11D7CBE1700DC754D /* AboutWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutWindowController.swift; sourceTree = "<group>"; };
 		3FE7E0E81D7CC01B00DC754D /* RulesEditorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulesEditorWindowController.swift; sourceTree = "<group>"; };
 		3FF2410A1EDB4E0000E524CD /* SwitchMethodViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwitchMethodViewController.swift; sourceTree = "<group>"; };
+		3FF655C6207501AF00C8D2FC /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
+		3FF655C820751D1600C8D2FC /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = "<group>"; };
+		3FF655C920751D1600C8D2FC /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -138,7 +142,6 @@
 			files = (
 				3F6D52C32058737F00517E57 /* HockeySDK.framework in Frameworks */,
 				3F7291EF2025BD22005C9B70 /* Sparkle.framework in Frameworks */,
-				3F6D52C4205875BB00517E57 /* HockeySDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -226,6 +229,8 @@
 				3F6D52C6205BC82B00517E57 /* KeepSafe.swift */,
 				3FCD16B21D79797600C57B22 /* utils.h */,
 				3FCD16B31D79797600C57B22 /* utils.m */,
+				3FF655C920751D1600C8D2FC /* PFMoveApplication.h */,
+				3FF655C820751D1600C8D2FC /* PFMoveApplication.m */,
 			);
 			path = Misc;
 			sourceTree = "<group>";
@@ -290,6 +295,7 @@
 				3FCD16AB1D79793600C57B22 /* Info.plist */,
 				3F0E64141D8A8A59003243FE /* Fluor-Bridging-Header.h */,
 				3FE784E02053D455007F6200 /* README.md */,
+				3FF655C6207501AF00C8D2FC /* dsa_pub.pem */,
 			);
 			path = Fluor;
 			sourceTree = "<group>";
@@ -337,7 +343,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Pyrolyse;
 				TargetAttributes = {
 					3FCD16A01D79793600C57B22 = {
@@ -384,6 +390,7 @@
 				3F3433341E50C53A009F4D86 /* ReleaseNotes.rtf in Resources */,
 				3F6D52CA2069659800517E57 /* About.storyboard in Resources */,
 				3F3433321E50C2E0009F4D86 /* ReleaseNotesWindowController.xib in Resources */,
+				3FF655C7207501AF00C8D2FC /* dsa_pub.pem in Resources */,
 				3F4ABD0E201937B30075B178 /* RulesEditor.storyboard in Resources */,
 				3FCD16AA1D79793600C57B22 /* MainMenu.xib in Resources */,
 			);
@@ -443,6 +450,7 @@
 				3F7291F22028BC6B005C9B70 /* PreferencesWindowController.swift in Sources */,
 				3FE7E0E31D7CBE1700DC754D /* AboutWindowController.swift in Sources */,
 				3FE7E0E01D7CA14600DC754D /* LaunchAtLoginController.m in Sources */,
+				3FF655CA20751D1600C8D2FC /* PFMoveApplication.m in Sources */,
 				3F8879931FBF5F2A005C28E6 /* PreferencesTabViewController.swift in Sources */,
 				3F2FA4051D7A1F87003E2AD8 /* BehaviorManager.swift in Sources */,
 				3F6D52CE20696E2100517E57 /* LinkButton.swift in Sources */,
@@ -502,13 +510,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -536,7 +546,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.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -559,13 +569,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -587,7 +599,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.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -636,8 +648,10 @@
 				INFOPLIST_FILE = Fluor/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				OTHER_SWIFT_FLAGS = "-DRELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pyrolyse.Fluor;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Fluor/Fluor-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;

diff --git a/Fluor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Fluor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/128.png b/Fluor/Assets.xcassets/AppIcon.appiconset/128.png
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected] b/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/16.png b/Fluor/Assets.xcassets/AppIcon.appiconset/16.png
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected] b/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/256.png b/Fluor/Assets.xcassets/AppIcon.appiconset/256.png
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected] b/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/32.png b/Fluor/Assets.xcassets/AppIcon.appiconset/32.png
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected] b/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/512.png b/Fluor/Assets.xcassets/AppIcon.appiconset/512.png
diff --git a/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected] b/Fluor/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/Fluor/Base.lproj/About.storyboard b/Fluor/Base.lproj/About.storyboard
@@ -167,11 +167,11 @@
                                 </customSpacing>
                             </stackView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i2i-Ca-L3z" customClass="LinkButton" customModule="Fluor" customModuleProvider="target">
-                                <rect key="frame" x="85" y="30" width="86" height="17"/>
+                                <rect key="frame" x="72" y="30" width="113" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="kbO-VN-pYj"/>
                                 </constraints>
-                                <buttonCell key="cell" type="bevel" title="Fluor support" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="k51-I5-gTD">
+                                <buttonCell key="cell" type="bevel" title="Technical support" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="k51-I5-gTD">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>

diff --git a/Fluor/Base.lproj/MainMenu.xib b/Fluor/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>

diff --git a/Fluor/Base.lproj/Preferences.storyboard b/Fluor/Base.lproj/Preferences.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="fj3-CW-kly">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="fj3-CW-kly">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
     </dependencies>
@@ -46,7 +46,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <font key="font" metaFont="message"/>
-                        <tabViewItems/>
                         <connections>
                             <outlet property="delegate" destination="glG-bk-x2Q" id="a3g-rc-2Za"/>
                         </connections>

diff --git a/Fluor/Base.lproj/RulesEditor.storyboard b/Fluor/Base.lproj/RulesEditor.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="W33-Be-Q5Y">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="W33-Be-Q5Y">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
         <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>

diff --git a/Fluor/Base.lproj/RunningApps.storyboard b/Fluor/Base.lproj/RunningApps.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="GhL-73-3vr">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="GhL-73-3vr">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
         <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>

diff --git a/Fluor/Controllers/ViewControllers/AboutViewController.swift b/Fluor/Controllers/ViewControllers/AboutViewController.swift
@@ -46,7 +46,9 @@ class AboutViewController: NSViewController {
     }
 
     @IBAction func goToSupport(_ sender: Any) {
-        self.openUrlForInfo(key: "FLSupportURL")
+        if let mailURL = URL(string: "mailto:[email protected]?subject=Fluor%20Issue") {
+            NSWorkspace.shared.open(mailURL)
+        }
     }
 
     private func openUrlForInfo(key: String) {

diff --git a/Fluor/Controllers/ViewControllers/PreferencesTabViewController.swift b/Fluor/Controllers/ViewControllers/PreferencesTabViewController.swift
@@ -10,10 +10,10 @@ import Cocoa
 
 class PreferencesTabViewController: NSTabViewController {
     override func tabView(_ tabView: NSTabView, shouldSelect tabViewItem: NSTabViewItem?) -> Bool {
-        if let id = tabViewItem?.identifier as? String, "updates_tab" == id {
-            self.showBetaAlert()
-            return false
-        }
+//        if let id = tabViewItem?.identifier as? String, "updates_tab" == id {
+//            self.showBetaAlert()
+//            return false
+//        }
         return true
     }
 

diff --git a/Fluor/Controllers/ViewControllers/RunningAppsViewController.swift b/Fluor/Controllers/ViewControllers/RunningAppsViewController.swift
@@ -82,7 +82,7 @@ class RunningAppsViewController: NSViewController, BehaviorDidChangeHandler, NST
     }
 
     private func fetchRunningApps() -> [RuleItem] {
-        return NSWorkspace.shared.runningApplications.flatMap { (app) -> RuleItem? in
+        return NSWorkspace.shared.runningApplications.compactMap { (app) -> RuleItem? in
             guard let appId = app.bundleIdentifier, let appURL = app.bundleURL, let appIcon = app.icon else { return nil }
             let isApp = app.activationPolicy == .regular
             guard showAll || isApp else { return nil }

diff --git a/Fluor/Fluor-Bridging-Header.h b/Fluor/Fluor-Bridging-Header.h
@@ -13,4 +13,4 @@
 #import <HockeySDK/HockeySDK.h>
 #include "utils.h"
 #include "LaunchAtLoginController.h"
-
+#include "PFMoveApplication.h"
diff --git a/Fluor/Info.plist b/Fluor/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.0</string>
 	<key>CFBundleVersion</key>
-	<string>1210</string>
+	<string>1225</string>
 	<key>FLGithubURL</key>
 	<string>https://github.com/Pyroh/Fluor</string>
 	<key>FLPyrolyseURL</key>
@@ -42,5 +42,9 @@
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<false/>
+	<key>SUFeedURL</key>
+	<string>https://updates.pyrolyse.it/Fluor/2.0/appcast.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
 </dict>
 </plist>
diff --git a/Fluor/Misc/AppDelegate.swift b/Fluor/Misc/AppDelegate.swift
@@ -11,6 +11,9 @@ import Cocoa
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_ notification: Notification) {
+        #if RELEASE
+            PFMoveToApplicationsFolderIfNecessary()
+        #endif
         HAHelper.default.initManager()
         HAHelper.default.eventFluorStarted()
 

diff --git a/Fluor/Misc/PFMoveApplication.h b/Fluor/Misc/PFMoveApplication.h
@@ -0,0 +1,32 @@
+//
+//  PFMoveApplication.h, version 1.24
+//  LetsMove
+//
+//  Created by Andy Kim at Potion Factory LLC on 9/17/09
+//
+//  The contents of this file are dedicated to the public domain.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#import <Foundation/Foundation.h>
+
+/**
+ Moves the running application to ~/Applications or /Applications if the former does not exist.
+ After the move, it relaunches app from the new location.
+ DOES NOT work for sandboxed applications.
+ 
+ Call from \c NSApplication's delegate method \c -applicationWillFinishLaunching: method. */
+void PFMoveToApplicationsFolderIfNecessary(void);
+
+/**
+ Check whether an app move is currently in progress.
+ Returns YES if LetsMove is currently in-progress trying to move the app to the Applications folder, or NO otherwise.
+ This can be used to work around a crash with apps that terminate after last window is closed.
+ See https://github.com/potionfactory/LetsMove/issues/64 for details. */
+BOOL PFMoveIsInProgress(void);
+
+#ifdef __cplusplus
+}
+#endif