Merge pull request #11 from Andrea-Scuderi/feature/swift_5_1_5

Andrea-Scuderi · web-flow · commit fbc45cc29522 · 2020-03-22T21:25:04.000Z
Update to Swift 5.1.5
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM swift:5.1.4
+FROM swift:5.1.5
 
 # Or your actual UID, GID on Linux if not the default 1000
 ARG USERNAME=vscode
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-SWIFT_VERSION?=5.1.4
+SWIFT_VERSION?=5.1.5
 
 DOCKER_TAG=nio-swift:$(SWIFT_VERSION)
 SWIFT_DOCKER_IMAGE=$(DOCKER_TAG)
diff --git a/docker/5.1.5/Dockerfile b/docker/5.1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM swift:5.1.4 as builder
+FROM swift:5.1.5 as builder
 
 RUN apt-get -qq update && apt-get -q -y install \
     libssl-dev libicu-dev

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM swift:5.1.4`
	`1`	`+FROM swift:5.1.5`
`2`	`2`
`3`	`3`	`# Or your actual UID, GID on Linux if not the default 1000`
`4`	`4`	`ARG USERNAME=vscode`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SWIFT_VERSION?=5.1.4`
	`1`	`+SWIFT_VERSION?=5.1.5`
`2`	`2`
`3`	`3`	`DOCKER_TAG=nio-swift:$(SWIFT_VERSION)`
`4`	`4`	`SWIFT_DOCKER_IMAGE=$(DOCKER_TAG)`