Skip to content

feat: add acknowledgements #128

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
okwasniewski merged 3 commits into from
Sep 8, 2024
Merged

feat: add acknowledgements #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8732c1
feat: add acknowledgements
okwasniewski Sep 7, 2024
4d3f514
fix: make ci parallel
okwasniewski Sep 7, 2024
a93aafb
feat: add spm cache
okwasniewski Sep 8, 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
35 changes: 0 additions & 35 deletions .github/workflows/build-app.yml
View file
Open in desktop

This file was deleted.

72 changes: 72 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: MiniSim CI

on:
pull_request:
branches:
- main
push:
branches:
- main

concurrency:
group: ${{ github.ref }}-build
cancel-in-progress: true

env:
DERIVED_DATA_PATH: ${{ github.workspace }}/DerivedData

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: GitHub Action for SwiftLint
uses: norio-nomura/[email protected]

build:
runs-on: macos-14
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: 15
- name: Cache DerivedData
uses: actions/cache@v2
with:
path: ${{ env.DERIVED_DATA_PATH }}
key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.xcodeproj/project.pbxproj') }}
restore-keys: |
${{ runner.os }}-deriveddata-
- name: Build
run: |
set -o pipefail && xcodebuild -scheme MiniSim -destination 'platform=macOS' \
-skipPackagePluginValidation -skipMacroValidation \
-derivedDataPath ${{ env.DERIVED_DATA_PATH }} \
build-for-testing \
COMPILER_INDEX_STORE_ENABLE=NO | xcbeautify --renderer github-actions

test:
needs: build
runs-on: macos-14
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: 15
- name: Cache DerivedData
uses: actions/cache@v2
with:
path: ${{ env.DERIVED_DATA_PATH }}
key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.xcodeproj/project.pbxproj') }}
- name: Test
run: |
xcodebuild -scheme MiniSim -destination 'platform=macOS' \
-skipPackagePluginValidation -skipMacroValidation \
-derivedDataPath ${{ env.DERIVED_DATA_PATH }} \
test-without-building \
COMPILER_INDEX_STORE_ENABLE=NO | xcbeautify --renderer github-actions
16 changes: 0 additions & 16 deletions .github/workflows/swiftlint.yml
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions MiniSim.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
76AC9AF62A0EA82C00864A8B /* CustomCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76AC9AF52A0EA82C00864A8B /* CustomCommands.swift */; };
76AC9AF92A0EB50800864A8B /* SymbolPicker in Frameworks */ = {isa = PBXBuildFile; productRef = 76AC9AF82A0EB50800864A8B /* SymbolPicker */; };
76B70F7E2B0D361A009D87A4 /* UserDefaultsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B70F7D2B0D361A009D87A4 /* UserDefaultsTests.swift */; };
76BF0AD92C8CB3E6003BE568 /* AcknowList in Frameworks */ = {isa = PBXBuildFile; productRef = 76BF0AD82C8CB3E6003BE568 /* AcknowList */; };
76BF0ADB2C8CB4CD003BE568 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = 76BF0ADA2C8CB4CD003BE568 /* Package.resolved */; };
76C1396A2C849A3F006CD80C /* MenuIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76C139692C849A3F006CD80C /* MenuIcons.swift */; };
76E4451229D4391000039025 /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E4451129D4391000039025 /* Onboarding.swift */; };
76E4451429D4403F00039025 /* NSNotificationName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E4451329D4403F00039025 /* NSNotificationName.swift */; };
Expand Down Expand Up @@ -167,6 +169,7 @@
76AC9AF52A0EA82C00864A8B /* CustomCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomCommands.swift; sourceTree = "<group>"; };
76B70F742B0D359D009D87A4 /* MiniSimTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MiniSimTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
76B70F7D2B0D361A009D87A4 /* UserDefaultsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsTests.swift; sourceTree = "<group>"; };
76BF0ADA2C8CB4CD003BE568 /* Package.resolved */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Package.resolved; path = MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = SOURCE_ROOT; };
76C139692C849A3F006CD80C /* MenuIcons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuIcons.swift; sourceTree = "<group>"; };
76E4451129D4391000039025 /* Onboarding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding.swift; sourceTree = "<group>"; };
76E4451329D4403F00039025 /* NSNotificationName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSNotificationName.swift; sourceTree = "<group>"; };
Expand All @@ -187,6 +190,7 @@
buildActionMask = 2147483647;
files = (
765077C62C46F04A00C7B5F3 /* Settings in Frameworks */,
76BF0AD92C8CB3E6003BE568 /* AcknowList in Frameworks */,
768F8EC829954C8A00DFBCDB /* Sparkle in Frameworks */,
76F04A14298A62CF00BF9CA3 /* ShellOut in Frameworks */,
76AC9AF92A0EB50800864A8B /* SymbolPicker in Frameworks */,
Expand Down Expand Up @@ -356,6 +360,7 @@
7645D5002982E6FA00019227 /* main.swift */,
766BD2372981628C0042261B /* Assets.xcassets */,
766BD23C2981628C0042261B /* MiniSim.entitlements */,
76BF0ADA2C8CB4CD003BE568 /* Package.resolved */,
766BD2392981628C0042261B /* Preview Content */,
);
path = MiniSim;
Expand Down Expand Up @@ -452,6 +457,7 @@
76AC9AF82A0EB50800864A8B /* SymbolPicker */,
763EEB122A26896B008428F1 /* CodeEditor */,
765077C52C46F04A00C7B5F3 /* Settings */,
76BF0AD82C8CB3E6003BE568 /* AcknowList */,
);
productName = MiniSim;
productReference = 766BD2302981628A0042261B /* MiniSim.app */;
Expand Down Expand Up @@ -513,6 +519,7 @@
763EEB112A26896B008428F1 /* XCRemoteSwiftPackageReference "CodeEditor" */,
4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */,
76A5C3B72C46E4C40064118A /* XCRemoteSwiftPackageReference "Settings" */,
76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */,
);
productRefGroup = 766BD2312981628A0042261B /* Products */;
projectDirPath = "";
Expand All @@ -530,6 +537,7 @@
buildActionMask = 2147483647;
files = (
766BD23B2981628C0042261B /* Preview Assets.xcassets in Resources */,
76BF0ADB2C8CB4CD003BE568 /* Package.resolved in Resources */,
766BD2382981628C0042261B /* Assets.xcassets in Resources */,
7610992D2A3F95850067885A /* MiniSim.sdef in Resources */,
765C44C82A2A6C9600FCC159 /* MainMenu.xib in Resources */,
Expand Down Expand Up @@ -999,6 +1007,14 @@
minimumVersion = 1.0.0;
};
};
76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/vtourraine/AcknowList";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.2.0;
};
};
76F04A12298A62CF00BF9CA3 /* XCRemoteSwiftPackageReference "ShellOut" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/JohnSundell/ShellOut.git";
Expand Down Expand Up @@ -1050,6 +1066,11 @@
package = 4A7892862AF1A767004D3FC8 /* XCRemoteSwiftPackageReference "SwiftLint" */;
productName = "plugin:SwiftLintPlugin";
};
76BF0AD82C8CB3E6003BE568 /* AcknowList */ = {
isa = XCSwiftPackageProductDependency;
package = 76BF0AD72C8CB3E6003BE568 /* XCRemoteSwiftPackageReference "AcknowList" */;
productName = AcknowList;
};
76F04A13298A62CF00BF9CA3 /* ShellOut */ = {
isa = XCSwiftPackageProductDependency;
package = 76F04A12298A62CF00BF9CA3 /* XCRemoteSwiftPackageReference "ShellOut" */;
Expand Down
60 changes: 35 additions & 25 deletions MiniSim.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions MiniSim/MiniSim.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class MiniSim: NSObject {
override init() {
super.init()

settingsController.window?.delegate = self

setDefaultValues()
initObservers()

Expand Down Expand Up @@ -159,6 +157,7 @@ class MiniSim: NSObject {
if let tag = MainMenuActions(rawValue: sender.tag) {
switch tag {
case .preferences:
settingsController.window?.delegate = self
settingsController.show()
settingsController.window?.orderFrontRegardless()
case .quit:
Expand Down
Loading