Skip to content

Commit 6cac20f

Browse files
Merge pull request #283 from sakrist/main
Update readme
2 parents 9135044 + 1738361 commit 6cac20f

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/compatibility.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
uses: actions/checkout@v4
1313
- uses: swiftwasm/setup-swiftwasm@v1
1414
with:
15-
swift-version: wasm-5.10.0-RELEASE
15+
swift-version: wasm-6.0.3-RELEASE
1616
- name: Run Test
1717
run: |
1818
set -eux
1919
make bootstrap
2020
cd Examples/Basic
21-
swift build --triple wasm32-unknown-wasi
22-
swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS
21+
swift build --triple wasm32-unknown-wasi --static-swift-stdlib
22+
swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS --static-swift-stdlib

Examples/Basic/Package.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.10
1+
// swift-tools-version:6.0
22

33
import PackageDescription
44

@@ -16,5 +16,6 @@ let package = Package(
1616
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit")
1717
]
1818
)
19-
]
19+
],
20+
swiftLanguageVersions: [.v5]
2021
)

Examples/Embedded/Package.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.10
1+
// swift-tools-version:6.0
22

33
import PackageDescription
44

@@ -32,5 +32,6 @@ let package = Package(
3232
])
3333
]
3434
)
35-
]
35+
],
36+
swiftLanguageModes: [.v5]
3637
)

Examples/Embedded/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Embedded example
22

3-
Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-DEVELOPMENT-SNAPSHOT-2024-09-25-a)
3+
Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-6.1-DEVELOPMENT-SNAPSHOT-2025-02-21-a)
44

55
```sh
66
$ ./build.sh

README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,14 @@ Not all of these versions are tested on regular basis though, compatibility repo
178178

179179
## Usage in a browser application
180180

181-
The easiest way to get started with JavaScriptKit in your browser app is with [the `carton`
181+
The easiest is to start with [Examples](/Examples) which has JavaScript glue runtime.
182+
183+
Second option is to get started with JavaScriptKit in your browser app is with [the `carton`
182184
bundler](https://carton.dev). Add carton to your swift package dependencies:
183185

184186
```diff
185187
dependencies: [
186-
+ .package(url: "https://github.com/swiftwasm/carton", from: "1.0.0"),
188+
+ .package(url: "https://github.com/swiftwasm/carton", from: "1.1.3"),
187189
],
188190
```
189191

@@ -253,10 +255,6 @@ within it. You'll see `Hello, world!` output in the console. You can edit the ap
253255
your favorite editor and save it, `carton` will immediately rebuild the app and reload all
254256
browser tabs that have the app open.
255257

256-
You can also build your project with webpack.js and a manually installed SwiftWasm toolchain. Please
257-
see the following sections and the [Example](https://github.com/swiftwasm/JavaScriptKit/tree/main/Example)
258-
directory for more information in this more advanced use case.
259-
260258
## Sponsoring
261259

262260
[Become a gold or platinum sponsor](https://github.com/sponsors/swiftwasm/) and contact maintainers to add your logo on our README on Github with a link to your site.

0 commit comments

Comments
 (0)