Skip to content

Commit 71c1f67

Browse files
okwasniewskiokwasniewski
authored
feat: add acknowledgements (#128)
* feat: add acknowledgements * fix: make ci parallel * feat: add spm cache
1 parent 7b710d7 commit 71c1f67

File tree

7 files changed

+191
-121
lines changed

7 files changed

+191
-121
lines changed

‎.github/workflows/build-app.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: MiniSim CI
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
push:
8+
branches:
9+
- main
10+
11+
concurrency:
12+
group: ${{ github.ref }}-build
13+
cancel-in-progress: true
14+
15+
env:
16+
DERIVED_DATA_PATH: ${{ github.workspace }}/DerivedData
17+
18+
jobs:
19+
lint:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout Repository
23+
uses: actions/checkout@v2
24+
- name: GitHub Action for SwiftLint
25+
uses: norio-nomura/[email protected]
26+
27+
build:
28+
runs-on: macos-14
29+
steps:
30+
- name: Checkout Repository
31+
uses: actions/checkout@v2
32+
- name: Set up Xcode
33+
uses: maxim-lobanov/setup-xcode@v1
34+
with:
35+
xcode-version: 15
36+
- name: Cache DerivedData
37+
uses: actions/cache@v2
38+
with:
39+
path: ${{ env.DERIVED_DATA_PATH }}
40+
key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.xcodeproj/project.pbxproj') }}
41+
restore-keys: |
42+
${{ runner.os }}-deriveddata-
43+
- name: Build
44+
run: |
45+
set -o pipefail && xcodebuild -scheme MiniSim -destination 'platform=macOS' \
46+
-skipPackagePluginValidation -skipMacroValidation \
47+
-derivedDataPath ${{ env.DERIVED_DATA_PATH }} \
48+
build-for-testing \
49+
COMPILER_INDEX_STORE_ENABLE=NO | xcbeautify --renderer github-actions
50+
51+
test:
52+
needs: build
53+
runs-on: macos-14
54+
steps:
55+
- name: Checkout Repository
56+
uses: actions/checkout@v2
57+
- name: Set up Xcode
58+
uses: maxim-lobanov/setup-xcode@v1
59+
with:
60+
xcode-version: 15
61+
- name: Cache DerivedData
62+
uses: actions/cache@v2
63+
with:
64+
path: ${{ env.DERIVED_DATA_PATH }}
65+
key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.xcodeproj/project.pbxproj') }}
66+
- name: Test
67+
run: |
68+
xcodebuild -scheme MiniSim -destination 'platform=macOS' \
69+
-skipPackagePluginValidation -skipMacroValidation \
70+
-derivedDataPath ${{ env.DERIVED_DATA_PATH }} \
71+
test-without-building \
72+
COMPILER_INDEX_STORE_ENABLE=NO | xcbeautify --renderer github-actions

‎.github/workflows/swiftlint.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎MiniSim.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575
76AC9AF62A0EA82C00864A8B /* CustomCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76AC9AF52A0EA82C00864A8B /* CustomCommands.swift */; };
7676
76AC9AF92A0EB50800864A8B /* SymbolPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 76AC9AF82A0EB50800864A8B /* SymbolPicker */; };
7777
76B70F7E2B0D361A009D87A4 /* UserDefaultsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B70F7D2B0D361A009D87A4 /* UserDefaultsTests.swift */; };
78+
76BF0AD92C8CB3E6003BE568 /* AcknowList in Frameworks */ = {isa = PBXBuildFile; productRef = 76BF0AD82C8CB3E6003BE568 /* AcknowList */; };
79+
76BF0ADB2C8CB4CD003BE568 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = 76BF0ADA2C8CB4CD003BE568 /* Package.resolved */; };
7880
76C1396A2C849A3F006CD80C /* MenuIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76C139692C849A3F006CD80C /* MenuIcons.swift */; };
7981
76E4451229D4391000039025 /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E4451129D4391000039025 /* Onboarding.swift */; };
8082
76E4451429D4403F00039025 /* NSNotificationName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E4451329D4403F00039025 /* NSNotificationName.swift */; };
@@ -167,6 +169,7 @@
167169
76AC9AF52A0EA82C00864A8B /* CustomCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomCommands.swift; sourceTree = "<group>"; };
168170
76B70F742B0D359D009D87A4 /* MiniSimTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MiniSimTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
169171
76B70F7D2B0D361A009D87A4 /* UserDefaultsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsTests.swift; sourceTree = "<group>"; };
172+
76BF0ADA2C8CB4CD003BE568 /* Package.resolved */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Package.resolved; path = MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = SOURCE_ROOT; };
170173
76C139692C849A3F006CD80C /* MenuIcons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuIcons.swift; sourceTree = "<group>"; };
171174
76E4451129D4391000039025 /* Onboarding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding.swift; sourceTree = "<group>"; };
172175
76E4451329D4403F00039025 /* NSNotificationName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSNotificationName.swift; sourceTree = "<group>"; };
@@ -187,6 +190,7 @@
187190
buildActionMask = 2147483647;
188191
files = (
189192
765077C62C46F04A00C7B5F3 /* Settings in Frameworks */,
193+
76BF0AD92C8CB3E6003BE568 /* AcknowList in Frameworks */,
190194
768F8EC829954C8A00DFBCDB /* Sparkle in Frameworks */,
191195
76F04A14298A62CF00BF9CA3 /* ShellOut in Frameworks */,
192196
76AC9AF92A0EB50800864A8B /* SymbolPicker in Frameworks */,
@@ -356,6 +360,7 @@
356360
7645D5002982E6FA00019227 /* main.swift */,
357361
766BD2372981628C0042261B /* Assets.xcassets */,
358362
766BD23C2981628C0042261B /* MiniSim.entitlements */,
363+
76BF0ADA2C8CB4CD003BE568 /* Package.resolved */,
359364
766BD2392981628C0042261B /* Preview Content */,
360365
);
361366
path = MiniSim;
@@ -452,6 +457,7 @@
452457
76AC9AF82A0EB50800864A8B /* SymbolPicker */,
453458
763EEB122A26896B008428F1 /* CodeEditor */,
454459
765077C52C46F04A00C7B5F3 /* Settings */,
460+
76BF0AD82C8CB3E6003BE568 /* AcknowList */,
455461
);
456462
productName = MiniSim;
457463
productReference = 766BD2302981628A0042261B /* MiniSim.app */;
@@ -513,6 +519,7 @@
513519
763EEB112A26896B008428F1 /* XCRemoteSwiftPackageReference "CodeEditor" */,
514520
4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */,
515521
76A5C3B72C46E4C40064118A /* XCRemoteSwiftPackageReference "Settings" */,
522+
76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */,
516523
);
517524
productRefGroup = 766BD2312981628A0042261B /* Products */;
518525
projectDirPath = "";
@@ -530,6 +537,7 @@
530537
buildActionMask = 2147483647;
531538
files = (
532539
766BD23B2981628C0042261B /* Preview Assets.xcassets in Resources */,
540+
76BF0ADB2C8CB4CD003BE568 /* Package.resolved in Resources */,
533541
766BD2382981628C0042261B /* Assets.xcassets in Resources */,
534542
7610992D2A3F95850067885A /* MiniSim.sdef in Resources */,
535543
765C44C82A2A6C9600FCC159 /* MainMenu.xib in Resources */,
@@ -999,6 +1007,14 @@
9991007
minimumVersion = 1.0.0;
10001008
};
10011009
};
1010+
76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */ = {
1011+
isa = XCRemoteSwiftPackageReference;
1012+
repositoryURL = "https://github.com/vtourraine/AcknowList";
1013+
requirement = {
1014+
kind = upToNextMajorVersion;
1015+
minimumVersion = 3.2.0;
1016+
};
1017+
};
10021018
76F04A12298A62CF00BF9CA3 /* XCRemoteSwiftPackageReference "ShellOut" */ = {
10031019
isa = XCRemoteSwiftPackageReference;
10041020
repositoryURL = "https://github.com/JohnSundell/ShellOut.git";
@@ -1050,6 +1066,11 @@
10501066
package = 4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */;
10511067
productName = "plugin:SwiftLintPlugin";
10521068
};
1069+
76BF0AD82C8CB3E6003BE568 /* AcknowList */ = {
1070+
isa = XCSwiftPackageProductDependency;
1071+
package = 76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */;
1072+
productName = AcknowList;
1073+
};
10531074
76F04A13298A62CF00BF9CA3 /* ShellOut */ = {
10541075
isa = XCSwiftPackageProductDependency;
10551076
package = 76F04A12298A62CF00BF9CA3 /* XCRemoteSwiftPackageReference "ShellOut" */;

‎MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 35 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MiniSim/MiniSim.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class MiniSim: NSObject {
2323
override init() {
2424
super.init()
2525

26-
settingsController.window?.delegate = self
27-
2826
setDefaultValues()
2927
initObservers()
3028

@@ -159,6 +157,7 @@ class MiniSim: NSObject {
159157
if let tag = MainMenuActions(rawValue: sender.tag) {
160158
switch tag {
161159
case .preferences:
160+
settingsController.window?.delegate = self
162161
settingsController.show()
163162
settingsController.window?.orderFrontRegardless()
164163
case .quit:

0 commit comments

Comments
 (0)