Skip to content

Commit 60e8bab

Browse files
committed
Remove swift-dependencies for Windows compatibility
- Configure CI with PRIVATE_REPO_TOKEN for private repos - Update dependency versions to latest
1 parent ee657be commit 60e8bab

8 files changed

Lines changed: 24 additions & 50 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
env:
13+
PRIVATE_REPO_TOKEN: ${{ secrets.PRIVATE_REPO_TOKEN }}
14+
1215
concurrency:
1316
group: ci-${{ github.ref }}
1417
cancel-in-progress: true
@@ -21,6 +24,9 @@ jobs:
2124
steps:
2225
- uses: actions/checkout@v5
2326

27+
- name: Configure private repo access
28+
run: git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/"
29+
2430
- name: Select Xcode 26.0
2531
run: sudo xcode-select -s /Applications/Xcode_26.0.app
2632

@@ -59,6 +65,9 @@ jobs:
5965
steps:
6066
- uses: actions/checkout@v5
6167

68+
- name: Configure private repo access
69+
run: git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/"
70+
6271
- name: Cache Swift packages
6372
uses: actions/cache@v4
6473
with:
@@ -79,6 +88,9 @@ jobs:
7988
steps:
8089
- uses: actions/checkout@v5
8190

91+
- name: Configure private repo access
92+
run: git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/"
93+
8294
- name: Cache Swift packages
8395
uses: actions/cache@v4
8496
with:
@@ -97,6 +109,9 @@ jobs:
97109
steps:
98110
- uses: actions/checkout@v6
99111

112+
- name: Configure private repo access
113+
run: git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/".insteadOf "https://github.com/"
114+
100115
- name: Install Swift
101116
uses: SwiftyLab/setup-swift@latest
102117
with:

Package.swift

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ extension Target.Dependency {
2020
static var markdownHtmlRendering: Self { .product(name: "Markdown HTML Rendering", package: "swift-markdown-html-rendering") }
2121
static var css: Self { .product(name: "CSS", package: "swift-css") }
2222
static var cssTheming: Self { .product(name: "CSS Theming", package: "swift-css") }
23-
static var dependencies: Self { .product(name: "Dependencies", package: "swift-dependencies") }
24-
static var dependenciesTestSupport: Self { .product(name: "DependenciesTestSupport", package: "swift-dependencies") }
2523
static var orderedCollections: Self { .product(name: "OrderedCollections", package: "swift-collections") }
2624
static var translating: Self { .product(name: "Translating", package: "swift-translating") }
2725
static var standards: Self { .product(name: "Standards", package: "swift-standards") }
@@ -54,18 +52,17 @@ let package = Package(
5452
)
5553
],
5654
dependencies: [
57-
.package(url: "https://github.com/apple/swift-collections", from: "1.1.2"),
58-
.package(url: "https://github.com/coenttb/swift-html-rendering", from: "0.1.12"),
59-
.package(url: "https://github.com/coenttb/swift-markdown-html-rendering", from: "0.1.1"),
60-
.package(url: "https://github.com/coenttb/swift-css", from: "0.3.1"),
55+
.package(url: "https://github.com/apple/swift-collections", from: "1.3.0"),
56+
.package(url: "https://github.com/coenttb/swift-html-rendering", from: "0.1.14"),
57+
.package(url: "https://github.com/coenttb/swift-markdown-html-rendering", from: "0.1.2"),
58+
.package(url: "https://github.com/coenttb/swift-css", from: "0.4.0"),
6159
.package(url: "https://github.com/coenttb/swift-svg", from: "0.3.0"),
62-
.package(url: "https://github.com/coenttb/swift-translating", from: "0.0.1"),
63-
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.2"),
60+
.package(url: "https://github.com/coenttb/swift-translating", from: "0.3.0"),
6461
.package(url: "https://github.com/swift-standards/swift-html-standard", from: "0.1.6"),
65-
.package(url: "https://github.com/swift-standards/swift-standards", from: "0.16.1"),
66-
.package(url: "https://github.com/swift-standards/swift-incits-4-1986", from: "0.6.5"),
67-
.package(url: "https://github.com/swift-standards/swift-rfc-4648", from: "0.5.4"),
68-
.package(url: "https://github.com/swift-standards/swift-iso-9899", from: "0.2.2"),
62+
.package(url: "https://github.com/swift-standards/swift-standards", from: "0.20.0"),
63+
.package(url: "https://github.com/swift-standards/swift-incits-4-1986", from: "0.7.1"),
64+
.package(url: "https://github.com/swift-standards/swift-rfc-4648", from: "0.6.0"),
65+
.package(url: "https://github.com/swift-standards/swift-iso-9899", from: "0.2.3"),
6966
.package(url: "https://github.com/swift-standards/swift-whatwg-url", from: "0.2.5")
7067
],
7168
targets: [
@@ -76,7 +73,6 @@ let package = Package(
7673
.css,
7774
.markdownHtmlRendering,
7875
.htmlStandard,
79-
.dependencies,
8076
.orderedCollections,
8177
.standards,
8278
.incits4_1986,
@@ -100,7 +96,6 @@ let package = Package(
10096
.html,
10197
.markdownHtmlRendering,
10298
.cssTheming,
103-
.dependencies,
10499
.orderedCollections
105100
]
106101
),
@@ -109,7 +104,6 @@ let package = Package(
109104
dependencies: [
110105
.html,
111106
.htmlRenderableTestSupport,
112-
.dependenciesTestSupport,
113107
.product(
114108
name: "Translating",
115109
package: "swift-translating",

Sources/HTML/CSS Enhancements/Font.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import CSS
99
import CSS_Standard
10-
import Dependencies
1110

1211
public struct Font: Hashable, Sendable {
1312
public let family: CSS_Standard.FontFamily

Sources/HTML/Dependency.swift

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

Sources/HTML/HTML Enhancements/HTML.if.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// Created by Coen ten Thije Boonkkamp on 09/10/2024.
66
//
77

8-
import Dependencies
98
import Foundation
109
import HTML_Rendering
1110

Sources/HTML/HTML Enhancements/HTMLColor.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// Created by Coen ten Thije Boonkkamp on 17/09/2024.
66
//
77

8-
import Dependencies
98
import INCITS_4_1986
109
import ISO_9899
1110
import RFC_4648

Sources/HTMLComponents/exports.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
//
77

88
@_exported import CSS_Theming
9-
@_exported import Dependencies
109
@_exported import HTML

Sources/HTMLTheme/exports.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
//
77

88
@_exported import CSS_Theming
9-
@_exported import Dependencies
109
@_exported import HTML

0 commit comments

Comments
 (0)