Update dev container for swift (#1238)

Author: damuellen

containers/swift/.devcontainer/Dockerfile

@@ -14,15 +14,8 @@ ARG USER_GID=$USER_UID
 COPY library-scripts/common-debian.sh /tmp/library-scripts/
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
-    && apt-get -y install --no-install-recommends lldb python3-minimal libpython3.7 \
     && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/library-scripts
 
-# Install SourceKite, see https://github.com/vknabel/vscode-swift-development-environment/blob/master/README.md#installation
-RUN git clone https://github.com/vknabel/sourcekite \
-    && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/swift:/usr/lib \
-    && ln -s /usr/lib/libsourcekitdInProc.so /usr/lib/sourcekitdInProc \
-    && cd sourcekite && make install PREFIX=/usr/local -j2
-
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"
 ENV NVM_DIR=/usr/local/share/nvm

containers/swift/.devcontainer/devcontainer.json

@@ -17,23 +17,19 @@
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"lldb.adapterType": "bundled",
-		"lldb.executable": "/usr/bin/lldb",
-		"sde.languageservermode": "sourcekite",
-		"swift.path.sourcekite": "/usr/local/bin/sourcekite"
-	},
+ 		"lldb.library": "/usr/lib/liblldb.so",
+ 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"vknabel.vscode-swift-development-environment",
-		"vadimcn.vscode-lldb"
+		"sswg.swift-lang",
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "swiftc --version",
+	// "postCreateCommand": "",
 
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"

containers/swift/README.md

@@ -6,7 +6,7 @@
 
 | Metadata | Value |  
 |----------|-------|
-| *Contributors* | [cloudnull](https://github.com/cloudnull) |
+| *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 |
@@ -62,4 +62,4 @@ This definition includes some test code that will help you verify it is working
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-Licensed under the MIT License. See [LICENSE](https://github.com/microsoft/vscode-dev-containers/blob/main/LICENSE).
+Licensed under the MIT License. See [LICENSE](https://github.com/microsoft/vscode-dev-containers/blob/main/LICENSE).