dnrops
/
carton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update default toolchain version to 5.7.1 (#383)

This commit is contained in:
Yuta Saito 2022-09-30 00:31:48 +09:00 committed by GitHub
parent daf152d93d
commit 2fe7118e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/swiftwasm/swift:5.6-focal
FROM ghcr.io/swiftwasm/swift:5.7-focal
LABEL maintainer="SwiftWasm Maintainers <hello@swiftwasm.org>"
LABEL Description="Carton is a watcher, bundler, and test runner for your SwiftWasm apps"
@ -16,7 +16,7 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
rm -r /var/lib/apt/lists/*
ENV CARTON_ROOT=/root/.carton
ENV CARTON_DEFAULT_TOOLCHAIN=wasm-5.6.0-RELEASE
ENV CARTON_DEFAULT_TOOLCHAIN=wasm-5.7.1-RELEASE
RUN mkdir -p $CARTON_ROOT/sdk && \
mkdir -p $CARTON_ROOT/sdk/$CARTON_DEFAULT_TOOLCHAIN && \

2
Sources/CartonHelpers/DefaultToolchain.swift
View File

@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and
// limitations under the License.
public let defaultToolchainVersion = "wasm-5.6.0-RELEASE"
public let defaultToolchainVersion = "wasm-5.7.1-RELEASE"

19
Sources/CartonKit/Model/Template.swift
View File

@ -179,7 +179,7 @@ extension Templates {
.init(
name: "Tokamak",
url: "https://github.com/TokamakUI/Tokamak",
version: .from("0.10.0")
version: .from("0.11.0")
),
],
targetDepencencies: [
@ -188,17 +188,16 @@ extension Templates {
terminal
)
try fileSystem.removeFileTree(project.path.appending(
let sources = project.path.appending(
components: "Sources",
project.name,
"main.swift"
))
project.name
)
try fileSystem.writeFileContents(project.path.appending(
components: "Sources",
project.name,
"App.swift"
)) {
for source in try fileSystem.getDirectoryContents(sources) {
try fileSystem.removeFileTree(sources.appending(components: source))
}
try fileSystem.writeFileContents(sources.appending(components: "App.swift")) {
"""
import TokamakDOM

4
Tests/CartonCommandTests/InitCommandTests.swift
View File

@ -39,8 +39,8 @@ final class InitCommandTests: XCTestCase {
"Sources/\(package) does not exist"
)
XCTAssertTrue(
packageDirectory.ls().contains("Sources/\(package)/main.swift"),
"Sources/\(package)/main.swift does not exist"
packageDirectory.ls().contains("Sources/\(package)/\(package).swift"),
"Sources/\(package)/\(package).swift does not exist"
)
XCTAssertTrue(packageDirectory.ls().contains("Tests"), "Tests does not exist")
XCTAssertTrue(