Skip to content

Commit

Permalink
Set versions of dependencies in Package.swift (#262)
Browse files Browse the repository at this point in the history
This allows specifying 0.3 (to be released after this PR is merged) dependency on Tokamak in `carton` templates, otherwise branch/commit dependencies in our `Package.swift` can't be correctly resolved.

`swift test` is temporarily disabled on macOS as the upstream Swift toolchain doesn't support unsafe flags in the JavaScriptKit dependency together with a `from` constraint. We could run it on Linux, but my OpenCombine fork doesn't support Linux builds yet (logged as #263).
  • Loading branch information
MaxDesiatov authored Aug 19, 2020
1 parent d97a5f3 commit 82111c5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
set -ex
sudo xcode-select --switch /Applications/Xcode_12_beta.app/Contents/Developer/
swift test
# swift test
xcodebuild -version
cd "NativeDemo"
xcodebuild -scheme iOS -destination 'generic/platform=iOS' \
Expand Down
14 changes: 7 additions & 7 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
"package": "JavaScriptKit",
"repositoryURL": "https://github.com/kateinoigakukun/JavaScriptKit.git",
"state": {
"branch": "c90e82f",
"branch": null,
"revision": "c90e82fe1d576a2ccd1aae798380bf80be7885fb",
"version": null
"version": "0.5.0"
}
},
{
"package": "OpenCombine",
"repositoryURL": "https://github.com/MaxDesiatov/OpenCombine.git",
"state": {
"branch": "observable-object-5.3",
"revision": "979d83e8725a504567827b89a5656bf4fd36d0c6",
"version": null
"branch": null,
"revision": "29ab27e488a1c9afef217b1435b3293d4a77b1ae",
"version": "0.0.1"
}
},
{
"package": "Runtime",
"repositoryURL": "https://github.com/MaxDesiatov/Runtime.git",
"state": {
"branch": "wasi-build-5.3",
"branch": null,
"revision": "a617ead8a125a97e69d6100e4d27922006e82e0a",
"version": null
"version": "2.1.2"
}
}
]
Expand Down
9 changes: 3 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,9 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
.package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", .revision("c90e82f")),
.package(url: "https://github.com/MaxDesiatov/Runtime.git", .branch("wasi-build-5.3")),
.package(
url: "https://github.com/MaxDesiatov/OpenCombine.git",
.branch("observable-object-5.3")
),
.package(url: "https://github.com/kateinoigakukun/JavaScriptKit.git", from: "0.5.0"),
.package(url: "https://github.com/MaxDesiatov/Runtime.git", from: "2.1.2"),
.package(url: "https://github.com/MaxDesiatov/OpenCombine.git", from: "0.0.1"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define
Expand Down

0 comments on commit 82111c5

Please sign in to comment.