Skip to content
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

Jump to bottom

Replace deprecated method #1760

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Replace deprecated method #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57dfe1d
Replace deprecated method
Eitot Jun 6, 2023
c9ea998
Fix GitHub Action
Eitot Jun 23, 2024
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
15 changes: 11 additions & 4 deletions .github/workflows/xcodebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ jobs:
test:
strategy:
matrix:
os: [macos-13, macos-14]
include:
- os: macos-13
xcode: /Applications/Xcode_15.2.app/Contents/Developer
- os: macos-14
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
DEVELOPER_DIR: ${{ matrix.xcode }}
timeout-minutes: 15

steps:
Expand All @@ -26,6 +29,10 @@ jobs:
with:
fetch-depth: 0
- name: Build Xcode project
run: xcodebuild build-for-testing -project Vienna.xcodeproj -scheme Vienna -configuration Development | xcpretty && exit ${PIPESTATUS[0]}
run: |
xcodebuild -version
xcodebuild build-for-testing -project Vienna.xcodeproj -scheme Vienna -configuration Development | xcpretty && exit ${PIPESTATUS[0]}
- name: Test Xcode project
run: xcodebuild test -project Vienna.xcodeproj -scheme Vienna -configuration Development | xcpretty && exit ${PIPESTATUS[0]}
run: |
xcodebuild -version
xcodebuild test -project Vienna.xcodeproj -scheme Vienna -configuration Development | xcpretty && exit ${PIPESTATUS[0]}
12 changes: 9 additions & 3 deletions Vienna/Sources/Application/AppController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,10 +909,16 @@ -(IBAction)downloadEnclosure:(id)sender
/* openVienna
* Calls into showMainWindow but activates the app first.
*/
-(IBAction)openVienna:(id)sender
- (IBAction)openVienna:(id)sender
{
[NSApp activateIgnoringOtherApps:YES];
[self showMainWindow:sender];
if (@available(macOS 14, *)) {
[NSApp activate];
} else {
[NSApp activateIgnoringOtherApps:YES];
}
if (NSApp.isActive) {
[self showMainWindow:sender];
}
}

/* showMainWindow
Expand Down