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
8 changes: 0 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
[submodule "diligence"]
path = macos/dependencies/diligence
url = https://github.com/inseven/diligence.git
branch = main
[submodule "interact"]
path = macos/dependencies/interact
url = https://github.com/inseven/interact.git
branch = main
[submodule "docs/_theme"]
path = docs/_theme
url = https://github.com/jbmorley/showcase-theme.git
Expand Down
13 changes: 0 additions & 13 deletions macos/Overview.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,6 @@
);
mainGroup = D8DCDDCC25F664440083DF48;
packageReferences = (
D8FA542F2E8A377B0028A0B4 /* XCLocalSwiftPackageReference "dependencies/diligence" */,
D8FA54322E8A37890028A0B4 /* XCLocalSwiftPackageReference "dependencies/interact" */,
);
productRefGroup = D8DCDDD625F664440083DF48 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -629,17 +627,6 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
D8FA542F2E8A377B0028A0B4 /* XCLocalSwiftPackageReference "dependencies/diligence" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = dependencies/diligence;
};
D8FA54322E8A37890028A0B4 /* XCLocalSwiftPackageReference "dependencies/interact" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = dependencies/interact;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
D87B38492E8A416300FAF17D /* OverviewCore */ = {
isa = XCSwiftPackageProductDependency;
Expand Down
10 changes: 7 additions & 3 deletions macos/OverviewCore/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,19 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/sparkle-project/Sparkle", .upToNextMajor(from: "2.7.1")),
.package(url: "https://github.com/inseven/glitter.git", .upToNextMajor(from: "0.1.2")),
.package(url: "https://github.com/inseven/diligence.git", from: "2.0.1"),
.package(url: "https://github.com/inseven/glitter.git", from: "0.1.2"),
.package(url: "https://github.com/inseven/interact.git", from: "3.10.5"),
.package(url: "https://github.com/sparkle-project/Sparkle", from: "2.7.1"),
],
targets: [
.target(
name: "OverviewCore",
dependencies: [
.product(name: "Sparkle", package: "Sparkle"),
.product(name: "Diligence", package: "diligence"),
.product(name: "Glitter", package: "glitter"),
.product(name: "Interact", package: "interact"),
.product(name: "Sparkle", package: "Sparkle"),
]
),

Expand Down
8 changes: 6 additions & 2 deletions macos/OverviewCore/Package_App_Store.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/sparkle-project/Sparkle", .upToNextMajor(from: "2.7.1")),
.package(url: "https://github.com/inseven/glitter.git", .upToNextMajor(from: "0.1.1")),
.package(url: "https://github.com/inseven/diligence.git", from: "2.0.1"),
.package(url: "https://github.com/inseven/glitter.git", from: "0.1.2"),
.package(url: "https://github.com/inseven/interact.git", from: "3.10.5"),
.package(url: "https://github.com/sparkle-project/Sparkle", from: "2.7.1"),
],
targets: [
.target(
name: "OverviewCore",
dependencies: [
.product(name: "Diligence", package: "diligence"),
.product(name: "Interact", package: "interact"),
]
),

Expand Down
1 change: 0 additions & 1 deletion macos/dependencies/diligence
Submodule diligence deleted from b018fc
1 change: 0 additions & 1 deletion macos/dependencies/interact
Submodule interact deleted from 1403b9