3 Commits
13 changed files with 57 additions and 64 deletions
+7 -7
View File
@@ -79,7 +79,7 @@
TargetAttributes = {
EBA7F0911E856279009EE061 = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 0900;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
};
@@ -177,6 +177,7 @@
"@loader_path/../Frameworks",
"@executable_path/../Frameworks",
);
MACH_O_TYPE = mh_execute;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -185,7 +186,7 @@
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -234,13 +235,14 @@
"@loader_path/../Frameworks",
"@executable_path/../Frameworks",
);
MACH_O_TYPE = mh_execute;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -252,8 +254,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Resources/DummyApp_Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = cl.fail.lordkamina.ThisAppDoesNothing;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -265,8 +266,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Resources/DummyApp_Info.plist";
PRODUCT_BUNDLE_IDENTIFIER = cl.fail.lordkamina.ThisAppDoesNothing;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
+7 -2
View File
@@ -34,8 +34,8 @@ The user-interface should be pretty self-explanatory; but, there are some things
- Gears designed by Freepik (http://www.freepik.com/free-vector/gray-background-of-gear_956712.htm)
## Current Version
- Version: 1.1.0
- Date: 2017-09-27
- Version: 1.1.2
- Date: 2018-10-07
## Known Issues
-
@@ -45,6 +45,11 @@ The user-interface should be pretty self-explanatory; but, there are some things
# Release Notes
## [1.1.2] - 2018-10-07
+ ### Changed
+ Migrated to Swift 4.2
+ Force Static linking of standard library, which should fix issues running on Mojave.
## [1.1.1] - 2018-04-15
+ ### Changed
+ Small changes for Swift 4.1.
+2 -2
View File
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleVersion</key>
<string>223</string>
<string>224</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Gregorio Litenstein Goldzweig. All rights reserved.</string>
<key>NSMainNibFile</key>
+14 -21
View File
@@ -268,7 +268,7 @@
TargetAttributes = {
EBD61FD81E47EC3C00549EE8 = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 0910;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
};
@@ -352,7 +352,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"";
shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -422,10 +422,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -438,14 +435,12 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IBC_FLATTEN_NIBS = NO;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_SWIFT_FLAGS = "-D Prefpane";
SDKROOT = macosx;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -483,9 +478,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -493,32 +486,31 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IBC_FLATTEN_NIBS = NO;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_SWIFT_FLAGS = "-D Prefpane";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Release;
};
EBD61FE91E47EC3C00549EE8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
DEVELOPMENT_TEAM = 33JDJVTQZT;
INFOPLIST_FILE = "$(SRCROOT)/Resources/Prefpane_Info.plist";
INSTALL_PATH = "$(HOME)/Library/PreferencePanes";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = cl.fail.lordkamina.SwiftDefaultApps;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = NO;
SWIFT_FORCE_STATIC_LINK_STDLIB = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_EXPORT_DECL = "";
WRAPPER_EXTENSION = prefPane;
@@ -528,17 +520,18 @@
EBD61FEA1E47EC3C00549EE8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_MODULES = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
DEVELOPMENT_TEAM = 33JDJVTQZT;
INFOPLIST_FILE = "$(SRCROOT)/Resources/Prefpane_Info.plist";
INSTALL_PATH = "$(HOME)/Library/PreferencePanes";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = cl.fail.lordkamina.SwiftDefaultApps;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = NO;
SWIFT_FORCE_STATIC_LINK_STDLIB = YES;
SWIFT_VERSION = 4.2;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_EXPORT_DECL = "";
WRAPPER_EXTENSION = prefPane;
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
@@ -159,7 +159,7 @@ class SWDAApplicationItem: NSObject, SWDAContentProtocol {
@objc var appBundleInfo: SWDAApplicationInfo?
/** Determine a hashValue from the Bundle ID to prevent duplicate Applications, since in practice Launch Services will not allow us to choose a specific version of an Application but rather choose the best according to its own set of criteria outlined in the Launch Services Programming Guide. */
override var hashValue: Int { return (self.appBundleInfo?.appBundleID)?.hashValue ?? -1 }
override var hash: Int { return (self.appBundleInfo?.appBundleID)?.hash ?? -1 }
init? (_ app: String) {
self.contentType = .Application
@@ -30,7 +30,7 @@ import Cocoa
else { return }
var objects: NSArray? = NSArray()
self.bundle?.loadNibNamed(NSNib.Name(rawValue: theNibName), owner: self, topLevelObjects: &objects)
self.bundle?.loadNibNamed(theNibName, owner: self, topLevelObjects: &objects)
if let theObjects = objects
{
for view in theObjects
@@ -53,7 +53,7 @@ import Cocoa
else {return nil}
var objects: NSArray? = NSArray()
var isLoaded = Bundle.main.loadNibNamed(NSNib.Name(rawValue: theNibName), owner: self, topLevelObjects: &objects)
var isLoaded = Bundle.main.loadNibNamed(theNibName, owner: self, topLevelObjects: &objects)
if isLoaded
{
return Bundle.main
@@ -188,8 +188,8 @@ class SWDATabViewController: NSTabViewController {
}
if (tabViewKVOContext == context) {
guard (change![.oldKey]! as! Int != -1) else { return }
let oldTab = self.childViewControllers[change![.oldKey]! as! Int].view as! SWDATabTemplate
let newTab = self.childViewControllers[change![.newKey]! as! Int].view as! SWDATabTemplate
let oldTab = self.children[change![.oldKey]! as! Int].view as! SWDATabTemplate
let newTab = self.children[change![.newKey]! as! Int].view as! SWDATabTemplate
if (newTab.selectionIndex != 0) {
newTab.setValue(NSIndexSet(index: newTab.selectionIndex!), forKey: "tableIndexes")
@@ -227,7 +227,7 @@ class SWDATabViewController: NSTabViewController {
(newTabVC.view as! SWDATabTemplate).tabIndex = (index != nil) ? index! : nil
(newTabVC.view as! SWDATabTemplate).nibName = "SWDAPrefpaneTabTemplate"
tabViewController.addChildViewController(newTabVC)
tabViewController.addChild(newTabVC)
let newTab = tabViewController.tabViewItem(for: newTabVC)!
newTab.label = tab
@@ -301,10 +301,10 @@ class HyperlinkTextField: NSTextField {
@IBInspectable var href: String = ""
override func awakeFromNib() {
super.awakeFromNib()
let attributes: [NSAttributedStringKey:AnyObject] = [
NSAttributedStringKey.foregroundColor: NSColor.blue,
NSAttributedStringKey.backgroundColor: NSColor.clear,
NSAttributedStringKey.underlineStyle: NSUnderlineStyle.styleSingle.rawValue as AnyObject
let attributes: [NSAttributedString.Key:AnyObject] = [
NSAttributedString.Key.foregroundColor: NSColor.blue,
NSAttributedString.Key.backgroundColor: NSColor.clear,
NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue as AnyObject
]
self.attributedStringValue = NSAttributedString(string: self.stringValue, attributes: attributes)
}
+12 -17
View File
@@ -255,13 +255,13 @@
OBJ_1 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1000;
TargetAttributes = {
OBJ_33 = {
LastSwiftMigration = 0900;
LastSwiftMigration = "";
};
OBJ_57 = {
LastSwiftMigration = 0900;
LastSwiftMigration = "";
};
};
};
@@ -377,12 +377,13 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
ONLY_ACTIVE_ARCH = YES;
OTHER_SWIFT_FLAGS = "-DXcode";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = macosx;
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
USE_HEADERMAP = NO;
};
name = Debug;
@@ -403,8 +404,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SUPPORTED_PLATFORMS = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGET_NAME = SwiftCLI;
};
name = Debug;
@@ -425,8 +425,7 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SUPPORTED_PLATFORMS = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGET_NAME = SwiftCLI;
};
name = Release;
@@ -474,7 +473,7 @@
SUPPORTED_PLATFORMS = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
USE_HEADERMAP = NO;
};
name = Release;
@@ -482,6 +481,7 @@
OBJ_59 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
@@ -499,17 +499,15 @@
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = YES;
SWIFT_FORCE_STATIC_LINK_STDLIB = NO;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGET_NAME = SwDefaultApps;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
OBJ_60 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks";
@@ -526,10 +524,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
SWIFT_FORCE_DYNAMIC_LINK_STDLIB = YES;
SWIFT_FORCE_STATIC_LINK_STDLIB = NO;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGET_NAME = SwDefaultApps;
SWIFT_VERSION = 4.2;
};
name = Release;
};
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"