Skip to content

Fix on macOS 10.13 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
w0lfschild merged 9 commits into from
Mar 17, 2018
Merged

Fix on macOS 10.13 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41d983b
Update Spotlight headers
krystofcelba Mar 15, 2018
9a8ebdc
Remove precompiled SpotlightSIMBL.xcodeproj
krystofcelba Mar 15, 2018
9bb03af
Fix plugins on macOS 10.13 🎉
krystofcelba Mar 15, 2018
38ff82e
Build SpotlightSIMBL as dependency of Flashlight app target 🔨
krystofcelba Mar 15, 2018
9933f20
Don't code sign by default
krystofcelba Mar 15, 2018
05be0b0
Bump versions ✨
krystofcelba Mar 15, 2018
06dc904
Improve backwards compatibility
krystofcelba Mar 15, 2018
905abad
Do some code cleanups
krystofcelba Mar 15, 2018
a7132ce
Bump version to 1.0.8 ✨
krystofcelba Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions FlashlightApp/EasySIMBL/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,13 @@ - (void)checkSpotlightVersion {
NSString *dstBndl = @"/Library/Application Support/SIMBL/Plugins/SpotlightSIMBL.bundle/Contents/Info.plist";
if ([[NSFileManager defaultManager] fileExistsAtPath:dstBndl]){
NSString *srcVer = [[[NSMutableDictionary alloc] initWithContentsOfFile:srcBndl] objectForKey:@"CFBundleVersion"];
#ifdef DEBUG
// Mock bundle version of currently loaded SpotlightSIMBL.bundle
// so it will get overwritten every time in DEBUG mode.
NSString *dstVer = @"-1";
#else
NSString *dstVer = [[[NSMutableDictionary alloc] initWithContentsOfFile:dstBndl] objectForKey:@"CFBundleVersion"];
#endif
if (![srcVer isEqual:dstVer] && ![srcPath isEqualToString:@""])
{
NSLog(@"\nSource: %@\nDestination: %@", srcVer, dstVer);
Expand Down
4 changes: 2 additions & 2 deletions FlashlightApp/EasySIMBL/Flashlight-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.6</string>
<string>1.0.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -65,7 +65,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>60</string>
<string>62</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
69 changes: 60 additions & 9 deletions FlashlightApp/Flashlight.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
30AF32A25F89BB482266017E /* libPods-Flashlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F301218945FC13823731C49D /* libPods-Flashlight.a */; };
5CD4D1FE205A3DCF00E7CA41 /* SpotlightSIMBL.bundle in Copy Bundle */ = {isa = PBXBuildFile; fileRef = 5CD4D1F4205A37F100E7CA41 /* SpotlightSIMBL.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5F2B37751A3E42E500AC2C19 /* SearchPluginEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F2B37731A3E42E500AC2C19 /* SearchPluginEditorWindowController.m */; };
5F2B37761A3E42E500AC2C19 /* SearchPluginEditorWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5F2B37741A3E42E500AC2C19 /* SearchPluginEditorWindowController.xib */; };
5F3878131AC2527C0003363D /* PluginInstallManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3878121AC2527C0003363D /* PluginInstallManager.m */; };
Expand Down Expand Up @@ -85,9 +86,25 @@
6C56449B159E7C0900215467 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6C564499159E7C0900215467 /* MainMenu.xib */; };
6C5644B8159E7D3900215467 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C5644B7159E7D3900215467 /* ServiceManagement.framework */; };
FB24C0271E5B0A39009C523B /* alarm.bundle in Copy Starter Pack */ = {isa = PBXBuildFile; fileRef = FB24C0261E5B0A39009C523B /* alarm.bundle */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
FB8B898E1D0E57A300E68B38 /* SpotlightSIMBL.bundle in Copy Bundle */ = {isa = PBXBuildFile; fileRef = FB8B898D1D0E57A300E68B38 /* SpotlightSIMBL.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
5CD4D1F3205A37F100E7CA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5CD4D1EF205A37F100E7CA41 /* SpotlightSIMBL.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 5F5B17411A05757500809207;
remoteInfo = SpotlightSIMBL;
};
5CD4D1FB205A389300E7CA41 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5CD4D1EF205A37F100E7CA41 /* SpotlightSIMBL.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 5F5B17401A05757400809207;
remoteInfo = SpotlightSIMBL;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
5F8CCEA81AD3A555009D200E /* Copy Starter Pack */ = {
isa = PBXCopyFilesBuildPhase;
Expand Down Expand Up @@ -126,7 +143,7 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
FB8B898E1D0E57A300E68B38 /* SpotlightSIMBL.bundle in Copy Bundle */,
5CD4D1FE205A3DCF00E7CA41 /* SpotlightSIMBL.bundle in Copy Bundle */,
);
name = "Copy Bundle";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -135,6 +152,7 @@

/* Begin PBXFileReference section */
1A17445B392804CE3CB1AE6B /* Pods-Flashlight.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Flashlight.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Flashlight/Pods-Flashlight.debug.xcconfig"; sourceTree = "<group>"; };
5CD4D1EF205A37F100E7CA41 /* SpotlightSIMBL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SpotlightSIMBL.xcodeproj; path = SpotlightSIMBL/SpotlightSIMBL.xcodeproj; sourceTree = "<group>"; };
5F11C2FD1A2B0834005A1731 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
5F2B37721A3E42E500AC2C19 /* SearchPluginEditorWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPluginEditorWindowController.h; sourceTree = "<group>"; };
5F2B37731A3E42E500AC2C19 /* SearchPluginEditorWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchPluginEditorWindowController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -289,7 +307,6 @@
F301218945FC13823731C49D /* libPods-Flashlight.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Flashlight.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FB24C0261E5B0A39009C523B /* alarm.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = alarm.bundle; sourceTree = "<group>"; };
FB8706281AB8B45D8405C11C /* Pods-Flashlight.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Flashlight.release.xcconfig"; path = "Pods/Target Support Files/Pods-Flashlight/Pods-Flashlight.release.xcconfig"; sourceTree = "<group>"; };
FB8B898D1D0E57A300E68B38 /* SpotlightSIMBL.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SpotlightSIMBL.bundle; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -309,6 +326,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
5CD4D1F0205A37F100E7CA41 /* Products */ = {
isa = PBXGroup;
children = (
5CD4D1F4205A37F100E7CA41 /* SpotlightSIMBL.bundle */,
);
name = Products;
sourceTree = "<group>";
};
5F6326B61A082FA900CE241E /* ITSwitch */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -461,7 +486,7 @@
6C564475159E7C0800215467 = {
isa = PBXGroup;
children = (
FB8B898D1D0E57A300E68B38 /* SpotlightSIMBL.bundle */,
5CD4D1EF205A37F100E7CA41 /* SpotlightSIMBL.xcodeproj */,
6C6AF45E1842DE3700E2ACBB /* README.md */,
6C56448A159E7C0800215467 /* FlashlightApp */,
6C564483159E7C0800215467 /* Frameworks */,
Expand Down Expand Up @@ -575,6 +600,7 @@
buildRules = (
);
dependencies = (
5CD4D1FC205A389300E7CA41 /* PBXTargetDependency */,
);
name = Flashlight;
productName = EasySIMBL;
Expand All @@ -590,7 +616,6 @@
LastUpgradeCheck = 0820;
TargetAttributes = {
6C56447F159E7C0800215467 = {
DevelopmentTeam = EX596BNL45;
DevelopmentTeamName = "wolfgang baird";
ProvisioningStyle = Manual;
};
Expand All @@ -617,13 +642,29 @@
mainGroup = 6C564475159E7C0800215467;
productRefGroup = 6C564481159E7C0800215467 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 5CD4D1F0205A37F100E7CA41 /* Products */;
ProjectRef = 5CD4D1EF205A37F100E7CA41 /* SpotlightSIMBL.xcodeproj */;
},
);
projectRoot = "";
targets = (
6C56447F159E7C0800215467 /* Flashlight */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
5CD4D1F4205A37F100E7CA41 /* SpotlightSIMBL.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = SpotlightSIMBL.bundle;
remoteRef = 5CD4D1F3205A37F100E7CA41 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
6C56447E159E7C0800215467 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down Expand Up @@ -743,6 +784,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
5CD4D1FC205A389300E7CA41 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = SpotlightSIMBL;
targetProxy = 5CD4D1FB205A389300E7CA41 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
5FC0166E1A1DBE7300F8E4E7 /* Localizable.strings */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -871,10 +920,11 @@
baseConfigurationReference = 1A17445B392804CE3CB1AE6B /* Pods-Flashlight.debug.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = EX596BNL45;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/EasySIMBL",
Expand All @@ -900,9 +950,10 @@
baseConfigurationReference = FB8706281AB8B45D8405C11C /* Pods-Flashlight.release.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = EX596BNL45;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/EasySIMBL",
Expand Down
4 changes: 3 additions & 1 deletion FlashlightApp/Flashlight.xcodeproj/xcshareddata/xcschemes/Flashlight.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -42,9 +43,10 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 2 additions & 2 deletions FlashlightApp/Flashlight.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions FlashlightApp/FlashlightKit/FlashlightKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
TargetAttributes = {
5FC13DED1A4E12DB008A0FE3 = {
CreatedOnToolsVersion = 6.1;
DevelopmentTeam = 4K8C8TCUQ6;
ProvisioningStyle = Manual;
};
5FC13DF81A4E12DB008A0FE3 = {
CreatedOnToolsVersion = 6.1;
Expand Down Expand Up @@ -683,10 +683,12 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand All @@ -703,6 +705,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.nateparrott.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand All @@ -712,10 +715,12 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand All @@ -732,6 +737,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.nateparrott.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
};
name = Release;
Expand Down
1 change: 0 additions & 1 deletion ...hlightApp/SpotlightSIMBL.bundle/Contents/Frameworks/FlashlightKit.framework/FlashlightKit
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion FlashlightApp/SpotlightSIMBL.bundle/Contents/Frameworks/FlashlightKit.framework/Resources
View file
Open in desktop

This file was deleted.

Binary file removed ...potlightSIMBL.bundle/Contents/Frameworks/FlashlightKit.framework/Versions/A/FlashlightKit
View file
Open in desktop
Binary file not shown.
39 changes: 0 additions & 39 deletions ...e/Contents/Frameworks/FlashlightKit.framework/Versions/A/Resources/BuiltinModules/i18n.py
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...tSIMBL.bundle/Contents/Frameworks/FlashlightKit.framework/Versions/A/Resources/Info.plist
View file
Open in desktop

This file was deleted.

Loading