Skip to content
Permalink
Browse files

Fix Xcode 11.2 build

  • Loading branch information
eczarny committed Nov 3, 2019
1 parent 1dec1ca commit 027d3cd13bed5c65e975e761a501ac6c39fab8e5
@@ -1,5 +1,5 @@
github "hamcrest/OCHamcrest" ~> 6.1
github "jonreid/OCMockito" ~> 4.1
github "sparkle-project/Sparkle" ~> 1.18
github "hamcrest/OCHamcrest" ~> 7.1
github "jonreid/OCMockito" ~> 5.1
github "sparkle-project/Sparkle" ~> 1.22
github "specta/expecta" ~> 1.0
github "specta/specta" ~> 1.0
@@ -1,5 +1,5 @@
github "hamcrest/OCHamcrest" "v6.1.1"
github "jonreid/OCMockito" "v4.1.0"
github "sparkle-project/Sparkle" "1.18.0"
github "hamcrest/OCHamcrest" "v7.1.2"
github "jonreid/OCMockito" "v5.1.2"
github "sparkle-project/Sparkle" "1.22.0"
github "specta/expecta" "v1.0.6"
github "specta/specta" "v1.0.6"
github "specta/specta" "v1.0.7"
@@ -616,7 +616,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1120;
TargetAttributes = {
2DA5B7C519F8BA79007EDE8E = {
CreatedOnToolsVersion = 6.1;
@@ -626,7 +626,7 @@
};
buildConfigurationList = 1DBD214C08BA80EA00186707 /* Build configuration list for PBXProject "Spectacle" */;
compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
en,
@@ -845,14 +845,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_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;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -891,14 +899,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_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;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -924,6 +940,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Spectacle;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -940,6 +957,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Spectacle;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -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>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D1E1AAF147E06AD0021D73D"
BuildableName = "Spectacle.app"
BlueprintName = "Spectacle"
ReferencedContainer = "container:Spectacle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D1E1AAF147E06AD0021D73D"
BuildableName = "Spectacle.app"
BlueprintName = "Spectacle"
ReferencedContainer = "container:Spectacle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
ReferencedContainer = "container:Spectacle.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@@ -294,8 +294,8 @@ - (void)dealloc
- (void)manageShortcuts
{
SpectacleShortcutAction action = ^(SpectacleShortcut *shortcut) {
[_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
[self->_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
};
NSArray<SpectacleShortcut *> *shortcuts = [_shortcutStorage loadShortcutsWithAction:action];
if (shortcuts.count != 0) {
@@ -81,8 +81,8 @@ - (void)shortcutRecorder:(SpectacleShortcutRecorder *)shortcutRecorder
didReceiveNewShortcut:(SpectacleShortcut *)shortcut
{
[_shortcutManager updateShortcut:[shortcut copyWithShortcutAction:^(SpectacleShortcut *shortcut) {
[_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
[self->_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
}]];
[[NSNotificationCenter defaultCenter] postNotificationName:@"SpectacleShortcutChangedNotification" object:self];
}
@@ -132,10 +132,10 @@ - (IBAction)restoreDefaults:(id)sender
{
[SpectacleUtilities displayRestoreDefaultsAlertWithConfirmationCallback:^() {
NSArray<SpectacleShortcut *> *shortcuts = SpectacleDefaultShortcutsWithAction(^(SpectacleShortcut *shortcut) {
[_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
[self->_windowPositionManager moveFrontmostWindowElement:[SpectacleAccessibilityElement frontmostWindowElement]
action:shortcut.windowAction];
});
[_shortcutManager updateShortcuts:shortcuts];
[self->_shortcutManager updateShortcuts:shortcuts];
[[NSNotificationCenter defaultCenter] postNotificationName:@"SpectacleRestoreDefaultShortcutsNotification"
object:self];
}];
@@ -7,7 +7,7 @@
+ (void)registerDefaultsForBundle:(NSBundle *)bundle;

+ (void)displayRunningInBackgroundAlertWithCallback:(void (^)(BOOL, BOOL))callback;
+ (void)displayRestoreDefaultsAlertWithConfirmationCallback:(void (^)())callback;
+ (void)displayRestoreDefaultsAlertWithConfirmationCallback:(void (^)(void))callback;

+ (NSString *)pathForPreferencePaneNamed:(NSString *)preferencePaneName;

@@ -42,7 +42,7 @@ + (void)displayRunningInBackgroundAlertWithCallback:(void (^)(BOOL, BOOL))callba
}
}

+ (void)displayRestoreDefaultsAlertWithConfirmationCallback:(void (^)())callback
+ (void)displayRestoreDefaultsAlertWithConfirmationCallback:(void (^)(void))callback
{
NSAlert *alert = [NSAlert new];
alert.messageText = NSLocalizedString(@"AlertMessageTextRestoreDefaults", @"The message text of the alert displayed when prompting to restore Spectacle's default shortcuts");
@@ -22,7 +22,7 @@ - (instancetype)initWithErrorHandler:(void(^)(NSString *message))errorHandler
NSString *errorMessage = [exception[@"message"] toString];
errorHandler([NSString stringWithFormat:@"%@\n%@", errorName, errorMessage]);
};
context[@"windowPositionCalculationRegistry"] = _windowPositionCalculationRegistry;
context[@"windowPositionCalculationRegistry"] = self->_windowPositionCalculationRegistry;
context[@"CGRectContainsRect"] = ^BOOL(CGRect rect1, CGRect rect2) {
return CGRectContainsRect(rect1, rect2);
};
@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>ZERO</string>
<key>CFBundleVersion</key>
<string></string>
<string>0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
@@ -71,24 +71,24 @@
expect(SpectacleTranslateKeyCode(kVK_F19)).to.equal(@"F19");
expect(SpectacleTranslateKeyCode(kVK_F20)).to.equal(@"F20");

expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadDecimal)).to.equal(@"."),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadMultiply)).to.equal(@"*"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadPlus)).to.equal(@"+"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadClear)).to.equal(@""),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadDivide)).to.equal(@"/"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadEnter)).to.equal(@""),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadMinus)).to.equal(@"-"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadEquals)).to.equal(@"="),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad0)).to.equal(@"0"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad1)).to.equal(@"1"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad2)).to.equal(@"2"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad3)).to.equal(@"3"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad4)).to.equal(@"4"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad5)).to.equal(@"5"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad6)).to.equal(@"6"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad7)).to.equal(@"7"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad8)).to.equal(@"8"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad9)).to.equal(@"9"),
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadDecimal)).to.equal(@".");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadMultiply)).to.equal(@"*");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadPlus)).to.equal(@"+");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadClear)).to.equal(@"");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadDivide)).to.equal(@"/");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadEnter)).to.equal(@"");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadMinus)).to.equal(@"-");
expect(SpectacleTranslateKeyCode(kVK_ANSI_KeypadEquals)).to.equal(@"=");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad0)).to.equal(@"0");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad1)).to.equal(@"1");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad2)).to.equal(@"2");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad3)).to.equal(@"3");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad4)).to.equal(@"4");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad5)).to.equal(@"5");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad6)).to.equal(@"6");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad7)).to.equal(@"7");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad8)).to.equal(@"8");
expect(SpectacleTranslateKeyCode(kVK_ANSI_Keypad9)).to.equal(@"9");

expect(SpectacleTranslateKeyCode(kVK_Return)).to.equal(@"");
expect(SpectacleTranslateKeyCode(kVK_Tab)).to.equal(@"");

0 comments on commit 027d3cd

Please sign in to comment.
You can’t perform that action at this time.