Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Build & Test

permissions:
contents: read

on:
pull_request:
paths-ignore:
Expand All @@ -15,13 +18,17 @@ jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
with:
persist-credentials: false
- run: make build

test:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
with:
persist-credentials: false
- name: Build and run tests
run: |
xcodebuild test \
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/www.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Website

permissions:
contents: read

on:
pull_request:
paths:
Expand All @@ -18,10 +21,12 @@ jobs:
run:
working-directory: www
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
with:
persist-credentials: false
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
with:
node-version: 22
- uses: oven-sh/setup-bun@v2
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6
- run: bun install
- run: bun run build
6 changes: 3 additions & 3 deletions Swift Shift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
E2D8CFB82B3C3B9B00EBB047 /* PermissionsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionsManager.swift; sourceTree = "<group>"; };
E2E6F5E92B3EF03C005B0D96 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
F400D7AF72C65A047C5C9D19 /* Constants.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Constants.swift; path = "Swift Shift/src/Constants.swift"; sourceTree = "<group>"; };
F8B92CDB5F568BDAA9756F45 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
F8B92CDB5F568BDAA9756F45 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -602,7 +602,7 @@
"$(inherited)",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_BUNDLE_IDENTIFIER = com.pablopunk.SwiftShiftTests;
PRODUCT_NAME = SwiftShiftTests;
SWIFT_VERSION = 5.0;
Expand All @@ -620,7 +620,7 @@
"$(inherited)",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_BUNDLE_IDENTIFIER = com.pablopunk.SwiftShiftTests;
PRODUCT_NAME = SwiftShiftTests;
SWIFT_VERSION = 5.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76A70D72EB4AAB358AE0D75"
BlueprintIdentifier = "4F0E66367D37633ED8A08262"
BuildableName = "SwiftShiftTests.xctest"
BlueprintName = "SwiftShiftTests"
ReferencedContainer = "container:Swift Shift.xcodeproj">
Expand All @@ -48,7 +48,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D76A70D72EB4AAB358AE0D75"
BlueprintIdentifier = "4F0E66367D37633ED8A08262"
BuildableName = "SwiftShiftTests.xctest"
BlueprintName = "SwiftShiftTests"
ReferencedContainer = "container:Swift Shift.xcodeproj">
Expand Down
6 changes: 4 additions & 2 deletions SwiftShiftTests/PreferencesManagerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,10 @@ final class PreferencesManagerTests: XCTestCase {
// System apps are always ignored
XCTAssertTrue(PreferencesManager.isAppIgnored("com.apple.notificationcenterui"))

// Default apps are initially ignored
XCTAssertTrue(PreferencesManager.isAppIgnored("pl.maketheweb.cleanshotx"))
// At least one default app should be initially ignored
XCTAssertTrue(
DEFAULT_IGNORED_APP_BUNDLE_ID.contains { PreferencesManager.isAppIgnored($0) }
)
}

func testIsAppIgnored_respectsCustomList() {
Expand Down
Loading