Skip to content

Commit

Permalink
Fixed dependencies breaking, removed carthage, docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@IvanMathy
IvanMathy committed Jun 20, 2020
1 parent 0042f91 commit 454f0b3
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 55 deletions.
82 changes: 39 additions & 43 deletions Boop/Boop.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,17 @@
2C60A54E24871273006496BA /* UpdateTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C60A4E524870678006496BA /* UpdateTextField.swift */; };
2C60A54F24871273006496BA /* PreferencesTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC211C2236E3141007CECEE /* PreferencesTabViewController.swift */; };
2C60A55024871273006496BA /* ScriptsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9761D82214E3B500AFF8CD /* ScriptsTableViewController.swift */; };
2C60A55224871273006496BA /* SavannaKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C3B003D22E3775300BBD4D0 /* SavannaKit.framework */; };
2C60A55524871273006496BA /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 2C9761D42214E11600AFF8CD /* scripts */; };
2C60A55624871273006496BA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C20667721FD62910082570E /* Assets.xcassets */; };
2C60A55724871273006496BA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C20667921FD62910082570E /* MainMenu.xib */; };
2C60A55824871273006496BA /* Preferences.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C5ED41D2357F67200322893 /* Preferences.storyboard */; };
2C60A55B24871273006496BA /* SavannaKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C3B003D22E3775300BBD4D0 /* SavannaKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2C60A56224871730006496BA /* UpdateTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C60A4E524870678006496BA /* UpdateTextField.swift */; };
2C8BE181249EBADC00099B73 /* SavannaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE180249EBADC00099B73 /* SavannaKit */; };
2C8BE182249EBADC00099B73 /* SavannaKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE180249EBADC00099B73 /* SavannaKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
2C8BE184249EBAEC00099B73 /* SavannaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE183249EBAEC00099B73 /* SavannaKit */; };
2C8BE185249EBAEC00099B73 /* SavannaKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE183249EBAEC00099B73 /* SavannaKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
2C8BE188249EBB3D00099B73 /* Fuse in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE187249EBB3D00099B73 /* Fuse */; };
2C8BE18A249EBB4200099B73 /* Fuse in Frameworks */ = {isa = PBXBuildFile; productRef = 2C8BE189249EBB4200099B73 /* Fuse */; };
2C9118B623406B530018916F /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9118B523406B530018916F /* Colors.swift */; };
2C9761D52214E11600AFF8CD /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 2C9761D42214E11600AFF8CD /* scripts */; };
2C9761D92214E3B500AFF8CD /* ScriptsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9761D82214E3B500AFF8CD /* ScriptsTableViewController.swift */; };
Expand All @@ -70,10 +74,6 @@
2CA245DC224822EA00586DFD /* ScriptTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA245DB224822EA00586DFD /* ScriptTableView.swift */; };
2CC211C3236E3141007CECEE /* PreferencesTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC211C2236E3141007CECEE /* PreferencesTabViewController.swift */; };
2CC211C5236FB5C1007CECEE /* ScriptsSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC211C4236FB5C1007CECEE /* ScriptsSettingsViewController.swift */; };
53D77B43249A4008002A2F02 /* Fuse in Frameworks */ = {isa = PBXBuildFile; productRef = 53D77B42249A4008002A2F02 /* Fuse */; };
53D77B46249A4019002A2F02 /* Fuse in Frameworks */ = {isa = PBXBuildFile; productRef = 53D77B45249A4019002A2F02 /* Fuse */; };
53D77B49249A4079002A2F02 /* SavannaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 53D77B48249A4079002A2F02 /* SavannaKit */; };
53D77B4A249A4079002A2F02 /* SavannaKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 53D77B48249A4079002A2F02 /* SavannaKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -93,7 +93,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
53D77B4A249A4079002A2F02 /* SavannaKit in Embed Frameworks */,
2C8BE182249EBADC00099B73 /* SavannaKit in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -104,20 +104,11 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
2C8BE185249EBAEC00099B73 /* SavannaKit in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
2C60A55A24871273006496BA /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
2C60A55B24871273006496BA /* SavannaKit.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -173,17 +164,17 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
53D77B43249A4008002A2F02 /* Fuse in Frameworks */,
53D77B49249A4079002A2F02 /* SavannaKit in Frameworks */,
2C8BE181249EBADC00099B73 /* SavannaKit in Frameworks */,
2C8BE188249EBB3D00099B73 /* Fuse in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
2C60A55124871273006496BA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2C60A55224871273006496BA /* SavannaKit.framework in Frameworks */,
53D77B46249A4019002A2F02 /* Fuse in Frameworks */,
2C8BE184249EBAEC00099B73 /* SavannaKit in Frameworks */,
2C8BE18A249EBB4200099B73 /* Fuse in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -373,8 +364,8 @@
);
name = Boop;
packageProductDependencies = (
53D77B42249A4008002A2F02 /* Fuse */,
53D77B48249A4079002A2F02 /* SavannaKit */,
2C8BE180249EBADC00099B73 /* SavannaKit */,
2C8BE187249EBB3D00099B73 /* Fuse */,
);
productName = Boop;
productReference = 2C20667221FD628E0082570E /* Boop.app */;
Expand All @@ -388,15 +379,15 @@
2C60A55124871273006496BA /* Frameworks */,
2C60A55424871273006496BA /* Resources */,
2C60A55924871273006496BA /* Embed Frameworks */,
2C60A55A24871273006496BA /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = "Boop (App Store)";
packageProductDependencies = (
53D77B45249A4019002A2F02 /* Fuse */,
2C8BE183249EBAEC00099B73 /* SavannaKit */,
2C8BE189249EBB4200099B73 /* Fuse */,
);
productName = Boop;
productReference = 2C60A56024871273006496BA /* Boop.app */;
Expand Down Expand Up @@ -431,8 +422,8 @@
);
mainGroup = 2C20666921FD628E0082570E;
packageReferences = (
53D77B41249A4008002A2F02 /* XCRemoteSwiftPackageReference "fuse-swift" */,
53D77B47249A4079002A2F02 /* XCRemoteSwiftPackageReference "savannakit" */,
2C8BE17F249EBADC00099B73 /* XCRemoteSwiftPackageReference "savannakit" */,
2C8BE186249EBB3D00099B73 /* XCRemoteSwiftPackageReference "fuse-swift" */,
);
productRefGroup = 2C20667321FD628E0082570E /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -901,39 +892,44 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
53D77B41249A4008002A2F02 /* XCRemoteSwiftPackageReference "fuse-swift" */ = {
2C8BE17F249EBADC00099B73 /* XCRemoteSwiftPackageReference "savannakit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "git@github.com:eimantas/fuse-swift";
repositoryURL = "https://github.com/IvanMathy/savannakit";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
kind = revision;
revision = 78bed4ccdaf0801f141900944e6e6de661c1ae07;
};
};
53D77B47249A4079002A2F02 /* XCRemoteSwiftPackageReference "savannakit" */ = {
2C8BE186249EBB3D00099B73 /* XCRemoteSwiftPackageReference "fuse-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "git@github.com:eimantas/savannakit";
repositoryURL = "https://github.com/IvanMathy/fuse-swift";
requirement = {
branch = master;
kind = branch;
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
53D77B42249A4008002A2F02 /* Fuse */ = {
2C8BE180249EBADC00099B73 /* SavannaKit */ = {
isa = XCSwiftPackageProductDependency;
package = 53D77B41249A4008002A2F02 /* XCRemoteSwiftPackageReference "fuse-swift" */;
productName = Fuse;
package = 2C8BE17F249EBADC00099B73 /* XCRemoteSwiftPackageReference "savannakit" */;
productName = SavannaKit;
};
53D77B45249A4019002A2F02 /* Fuse */ = {
2C8BE183249EBAEC00099B73 /* SavannaKit */ = {
isa = XCSwiftPackageProductDependency;
package = 53D77B41249A4008002A2F02 /* XCRemoteSwiftPackageReference "fuse-swift" */;
package = 2C8BE17F249EBADC00099B73 /* XCRemoteSwiftPackageReference "savannakit" */;
productName = SavannaKit;
};
2C8BE187249EBB3D00099B73 /* Fuse */ = {
isa = XCSwiftPackageProductDependency;
package = 2C8BE186249EBB3D00099B73 /* XCRemoteSwiftPackageReference "fuse-swift" */;
productName = Fuse;
};
53D77B48249A4079002A2F02 /* SavannaKit */ = {
2C8BE189249EBB4200099B73 /* Fuse */ = {
isa = XCSwiftPackageProductDependency;
package = 53D77B47249A4079002A2F02 /* XCRemoteSwiftPackageReference "savannakit" */;
productName = SavannaKit;
package = 2C8BE186249EBB3D00099B73 /* XCRemoteSwiftPackageReference "fuse-swift" */;
productName = Fuse;
};
/* End XCSwiftPackageProductDependency section */
};
Expand Down
8 changes: 4 additions & 4 deletions Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"pins": [
{
"package": "Fuse",
"repositoryURL": "git@github.com:eimantas/fuse-swift",
"repositoryURL": "https://github.com/IvanMathy/fuse-swift",
"state": {
"branch": null,
"revision": "acb9a2ec2789ce1dcca4d01872a20da801e7ac55",
Expand All @@ -12,10 +12,10 @@
},
{
"package": "SavannaKit",
"repositoryURL": "git@github.com:eimantas/savannakit",
"repositoryURL": "https://github.com/IvanMathy/savannakit",
"state": {
"branch": "master",
"revision": "c5f2119c95a2be3dfcbdf7320a90ff7e3be7a7f0",
"branch": null,
"revision": "78bed4ccdaf0801f141900944e6e6de661c1ae07",
"version": null
}
}
Expand Down
2 changes: 0 additions & 2 deletions Cartfile
View file

This file was deleted.

2 changes: 0 additions & 2 deletions Cartfile.resolved
View file

This file was deleted.

18 changes: 14 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,23 @@
<a href="https://sonarcloud.io/dashboard?id=IvanMathy_Boop"><img src="https://sonarcloud.io/api/project_badges/measure?project=IvanMathy_Boop&metric=alert_status"></a>
</p>
<p align="center">
<a href="https://boop.okat.best/">Website</a> • <a href="https://github.com/IvanMathy/Boop/releases">Download from Github</a> • <a href="https://apps.apple.com/us/app/boop/id1518425043">Get on the Mac App Store</a>
<a href="https://boop.okat.best/">Website</a> • <a href="https://github.com/IvanMathy/Boop/releases">Download from Github</a> • <a href="https://apps.apple.com/us/app/boop/id1518425043">Get on the Mac App Store</a><br/>
<a href="https://github.com/IvanMathy/Boop/blob/main/Boop/Documentation/Readme.md">Documentation</a> • <a href="https://github.com/IvanMathy/Boop/tree/main/Scripts">Find more scripts</a>
</p>

### How to build
### How to get Boop

There are four ways to get Boop. Your best bet is either to

- <a href="https://github.com/IvanMathy/Boop/releases">Download from GitHub releases</a> or
- <a href="https://apps.apple.com/us/app/boop/id1518425043">Download on the Mac App Store</a><br/>.

You can also build it from source, or <a href="https://formulae.brew.sh/cask/boop#default">get it from Homebrew</a>, although that is not officially supported.

### How to build from source

If you're just trying to get Boop, building from source might not be your best bet. Developing new scripts does not require building from source.

- Clone or download a copy of the repository
- If you don't already have it, get Carthage using `brew install carthage` or any of the other methods listed [here](https://github.com/Carthage/Carthage#installing-carthage).
- In terminal, `cd` into your copy and run `$ carthage bootstrap --cache-builds --platform macos`
- Open `Boop/Boop.xcodeproj`
- Press play
12 changes: 12 additions & 0 deletions Scripts/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

# Additional scripts

This folder contains useful scripts not included in the default Boop library you might want to download.

## Installing new scripts

To install a new script, simply download the .js file and place it into the same folder as your custom scripts. If Boop is already open, reload scripts from the `Scripts` menu.

## Contributing

Made something useful? Think of a way to improve an existing script? Feel free to open a pull request or a new issue on GitHub!

0 comments on commit 454f0b3

Please sign in to comment.