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

chore: 🤖 Migrate tools from Homebrew to SwiftPM #6

Merged
merged 2 commits into from
Jan 20, 2023
Merged

chore: 🤖 Migrate tools from Homebrew to SwiftPM #6

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
4b855f5
chore: 🤖 Migrate tools from Homebrew to SwiftPM
yk4to Jan 19, 2023
a6cb233
chore: 🤖 Use forked plug-in for XcodePlugin
yk4to Jan 19, 2023
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
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install Dependencies
run: |
brew install swiftgen
npm install --global create-dmg
- name: Create Folder
run: mkdir EjectKey/Generated
- name: Get Version Number
Expand Down Expand Up @@ -70,6 +66,8 @@ jobs:
xcodebuild -exportArchive -archivePath "$BUILD_DIR/$XCODE_ARCHIVE" -exportPath "$BUILD_DIR" -exportOptionsPlist "$EXPORT_OPTIONS_PLIST"
- name: Resign App
run: codesign --force --deep -s "$CODE_SIGN_IDENTITY" "$BUILD_DIR/$APP_NAME"
- name: Install Dependency
run: npm install --global create-dmg
- name: Create DMG
run: create-dmg "$BUILD_DIR/$APP_NAME"
continue-on-error: true
Expand Down
5 changes: 0 additions & 5 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ Please match the existing coding style as much as possible.

## Build Locally

You must have Xcode, SwiftLint and SwiftGen installed in your Mac.

You can install SwiftLint and SwiftGen from Homebrew.

```sh
brew install swiftgen swiftlint

git clone https://github.com/fus1ondev/EjectKey.git

Expand Down
81 changes: 38 additions & 43 deletions EjectKey.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@
isa = PBXNativeTarget;
buildConfigurationList = D6288ADD289EB5DC00F80FF1 /* Build configuration list for PBXNativeTarget "EjectKey" */;
buildPhases = (
D6288AE6289EBD3A00F80FF1 /* SwiftGen */,
D6288AEB289EBF3F00F80FF1 /* SwiftLint */,
D6288ACA289EB5DB00F80FF1 /* Sources */,
D6288ACB289EB5DB00F80FF1 /* Frameworks */,
D6288ACC289EB5DB00F80FF1 /* Resources */,
Expand All @@ -241,6 +239,8 @@
buildRules = (
);
dependencies = (
D68DAFBA29799C82009062CB /* PBXTargetDependency */,
D68DAFB22979946F009062CB /* PBXTargetDependency */,
D6B238D0296020560049CF72 /* PBXTargetDependency */,
);
name = EjectKey;
Expand Down Expand Up @@ -288,6 +288,8 @@
D6B238CC29601E690049CF72 /* XCRemoteSwiftPackageReference "DependencyList" */,
D6EF55A72962F714002E36EC /* XCRemoteSwiftPackageReference "Sparkle" */,
D637A85D2974374C00C6DD7D /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */,
D68DAFAC297993D4009062CB /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */,
D68DAFB829799C76009062CB /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */,
);
productRefGroup = D6288AC5289EB5DB00F80FF1;
projectDirPath = "";
Expand All @@ -311,47 +313,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
D6288AE6289EBD3A00F80FF1 /* SwiftGen */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"$(SRCROOT)/SwiftGenInput.xcfilelist",
);
inputPaths = (
);
name = SwiftGen;
outputFileListPaths = (
"$(SRCROOT)/SwiftGenOutput.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftgen >/dev/null; then\n swiftgen\nelse\n echo \"warning: SwiftGen not installed\"\nfi\n";
};
D6288AEB289EBF3F00F80FF1 /* SwiftLint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = SwiftLint;
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n if which swiftlint >/dev/null; then\n swiftlint\n else\n echo \"warning: SwiftLint not installed\"\n fi\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D6288ACA289EB5DB00F80FF1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -387,6 +348,14 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
D68DAFB22979946F009062CB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = D68DAFB12979946F009062CB /* SwiftLint */;
};
D68DAFBA29799C82009062CB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = D68DAFB929799C82009062CB /* SwiftGenPlugin */;
};
D6B238D0296020560049CF72 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = D6B238CF296020560049CF72 /* PrepareDependencyList */;
Expand Down Expand Up @@ -647,6 +616,22 @@
kind = branch;
};
};
D68DAFAC297993D4009062CB /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/lukepistrol/SwiftLintPlugin";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.2.2;
};
};
D68DAFB829799C76009062CB /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/BookBeat/SwiftGenPlugin";
requirement = {
branch = "xcodeproject-support";
kind = branch;
};
};
D6B238CC29601E690049CF72 /* XCRemoteSwiftPackageReference "DependencyList" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Kyome22/DependencyList";
Expand Down Expand Up @@ -686,6 +671,16 @@
package = D637A85D2974374C00C6DD7D /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */;
productName = LaunchAtLogin;
};
D68DAFB12979946F009062CB /* SwiftLint */ = {
isa = XCSwiftPackageProductDependency;
package = D68DAFAC297993D4009062CB /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */;
productName = "plugin:SwiftLint";
};
D68DAFB929799C82009062CB /* SwiftGenPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = D68DAFB829799C76009062CB /* XCRemoteSwiftPackageReference "SwiftGenPlugin" */;
productName = "plugin:SwiftGenPlugin";
};
D6B238CD29601E690049CF72 /* DependencyList */ = {
isa = XCSwiftPackageProductDependency;
package = D6B238CC29601E690049CF72 /* XCRemoteSwiftPackageReference "DependencyList" */;
Expand Down
18 changes: 18 additions & 0 deletions EjectKey.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,24 @@
"revision" : "fddd1c00396eed152c45a46bea9f47b98e59301d",
"version" : "1.2.0"
}
},
{
"identity" : "swiftgenplugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/BookBeat/SwiftGenPlugin",
"state" : {
"branch" : "xcodeproject-support",
"revision" : "1228d5a43ca791db0719d42f641c34a00b9c32f3"
}
},
{
"identity" : "swiftlintplugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/lukepistrol/SwiftLintPlugin",
"state" : {
"revision" : "f69b412a765396d44dc9f4788a5b79919c1ca9e3",
"version" : "0.2.2"
}
}
],
"version" : 2
Expand Down