diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index e16785157..04e2aa0d3 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -12,11 +12,11 @@ jobs: uses: actions/checkout@v4 - uses: swiftwasm/setup-swiftwasm@v1 with: - swift-version: wasm-5.10.0-RELEASE + swift-version: wasm-6.0.3-RELEASE - name: Run Test run: | set -eux make bootstrap cd Examples/Basic - swift build --triple wasm32-unknown-wasi - swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS + swift build --triple wasm32-unknown-wasi --static-swift-stdlib + swift build --triple wasm32-unknown-wasi -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS --static-swift-stdlib diff --git a/Examples/Basic/Package.swift b/Examples/Basic/Package.swift index aade23359..ea70e6b20 100644 --- a/Examples/Basic/Package.swift +++ b/Examples/Basic/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.0 import PackageDescription @@ -16,5 +16,6 @@ let package = Package( .product(name: "JavaScriptEventLoop", package: "JavaScriptKit") ] ) - ] + ], + swiftLanguageVersions: [.v5] ) diff --git a/Examples/Embedded/Package.swift b/Examples/Embedded/Package.swift index 227a049ff..f97638cc8 100644 --- a/Examples/Embedded/Package.swift +++ b/Examples/Embedded/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:6.0 import PackageDescription @@ -32,5 +32,6 @@ let package = Package( ]) ] ) - ] + ], + swiftLanguageModes: [.v5] ) diff --git a/Examples/Embedded/README.md b/Examples/Embedded/README.md index 2f388fcdc..e99d659ff 100644 --- a/Examples/Embedded/README.md +++ b/Examples/Embedded/README.md @@ -1,6 +1,6 @@ # Embedded example -Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-DEVELOPMENT-SNAPSHOT-2024-09-25-a) +Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-6.1-DEVELOPMENT-SNAPSHOT-2025-02-21-a) ```sh $ ./build.sh diff --git a/README.md b/README.md index 4bc6d2d15..5c5b76370 100644 --- a/README.md +++ b/README.md @@ -178,12 +178,14 @@ Not all of these versions are tested on regular basis though, compatibility repo ## Usage in a browser application -The easiest way to get started with JavaScriptKit in your browser app is with [the `carton` +The easiest is to start with [Examples](/Examples) which has JavaScript glue runtime. + +Second option is to get started with JavaScriptKit in your browser app is with [the `carton` bundler](https://carton.dev). Add carton to your swift package dependencies: ```diff dependencies: [ -+ .package(url: "https://github.com/swiftwasm/carton", from: "1.0.0"), ++ .package(url: "https://github.com/swiftwasm/carton", from: "1.1.3"), ], ``` @@ -253,10 +255,6 @@ within it. You'll see `Hello, world!` output in the console. You can edit the ap your favorite editor and save it, `carton` will immediately rebuild the app and reload all browser tabs that have the app open. -You can also build your project with webpack.js and a manually installed SwiftWasm toolchain. Please -see the following sections and the [Example](https://github.com/swiftwasm/JavaScriptKit/tree/main/Example) -directory for more information in this more advanced use case. - ## Sponsoring [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.