From d71c7ded629c87dafd550e3b6be754a311babd63 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Thu, 27 Oct 2022 17:17:17 +0100 Subject: [PATCH 1/3] Add swift 5.7 --- src/swift/.devcontainer/Dockerfile | 2 +- src/swift/devcontainer-template.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/swift/.devcontainer/Dockerfile b/src/swift/.devcontainer/Dockerfile index b4a14aa..e93a756 100644 --- a/src/swift/.devcontainer/Dockerfile +++ b/src/swift/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -# [Choice] Swift version: 5.6-focal, 5.5, 5.4, 5.3, 5.2, 5.1, 4.2 +# [Choice] Swift version: 5.7, 5.6-focal, 5.5, 5.4, 5.3, 5.2, 5.1, 4.2 ARG VARIANT=${templateOption:imageVariant} FROM swift:${VARIANT} diff --git a/src/swift/devcontainer-template.json b/src/swift/devcontainer-template.json index 7dd3809..84d17f7 100644 --- a/src/swift/devcontainer-template.json +++ b/src/swift/devcontainer-template.json @@ -2,7 +2,7 @@ "id": "swift", "version": "1.0.0", "name": "Swift", - "description": "Develop Swift based applications. Includes everything you need to get up and running.", + "description": "Develop Swift based applications. Includes appropriate runtime args and everything you need to get up and running.", "documentationURL": "https://github.com/microsoft/vscode-dev-containers/tree/main/containers/swift", "publisher": "Community", "licenseURL": "https://github.com/microsoft/vscode-dev-containers/blob/main/LICENSE", @@ -11,6 +11,7 @@ "type": "string", "description": "Swift version:", "proposals": [ + "5.7", "5.6-focal", "5.5", "5.4", @@ -19,7 +20,7 @@ "5.1", "4.2" ], - "default": "5.6-focal" + "default": "5.7" }, "installZsh": { "type": "boolean", From 63ac66c402b0486a4b7779426fa31fe5e0f67ffe Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Thu, 27 Oct 2022 17:36:13 +0100 Subject: [PATCH 2/3] Update README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index de29116..b916d0e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ | *Contributors* | [0xTim](https://github.com/0xTim), [adam-fowler](https://github.com/adam-fowler), [cloudnull](https://github.com/cloudnull) | | *Categories* | Community, Languages | | *Definition type* | Dockerfile | -| *Supported architecture(s)* | x86-64 | +| *Supported architecture(s)* | x86-64, arm64 | | *Works in Codespaces* | Yes | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | @@ -20,14 +20,14 @@ While the definition itself works unmodified, you can select the version of Swift the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container). ```json -"args": { "VARIANT": "4" } +"args": { "VARIANT": "5.7" } ``` Given how frequently web applications use Node.js for front end code, this container also includes an optional install of Node.js. You can enable installation and change the version of Node.js installed or disable its installation by updating the `args` property in `.devcontainer/devcontainer.json`. ```jsonc "args": { - "VARIANT": "4", + "VARIANT": "5.7", "NODE_VERSION": "14" // Set to "none" to skip Node.js installation } ``` From b76a99096ff1cea920dc0d015b61fdc29a834c3b Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Fri, 28 Oct 2022 14:49:16 +0100 Subject: [PATCH 3/3] tabbing --- src/swift/devcontainer-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/swift/devcontainer-template.json b/src/swift/devcontainer-template.json index 84d17f7..30eb436 100644 --- a/src/swift/devcontainer-template.json +++ b/src/swift/devcontainer-template.json @@ -11,7 +11,7 @@ "type": "string", "description": "Swift version:", "proposals": [ - "5.7", + "5.7", "5.6-focal", "5.5", "5.4",