Use swift-3.1.1-RELEASE + cherry picking PRs

PRs:
swiftlang/swift#8189
swiftlang/swift#8485

README.md

@@ -5,22 +5,22 @@
 But official distribution of Swift Toolchain for Linux does not have SourceKit yet.   
 This repository provides building method of docker images containing Swift Toolchain for Linux with SourceKit.  
 
-## Base version of Swift is `swift-3.1-RELEASE`
-It contains Swift repositories as submodules. Each submodules are basically pointing commits tagged by `swift-3.1-RELEASE`.
+## Base version of Swift is `swift-3.1.1-RELEASE`
+It contains Swift repositories as submodules. Each submodules are basically pointing commits tagged by `swift-3.1.1-RELEASE`.
 
 ## How to build images
 This repository provides two methods for building Docker images
 
-- **[recommended]** Build `sourcekit-builder` and `sourcekit:31` images
+- **[recommended]** Build `sourcekit-builder` and `sourcekit:311` images
 - Build in the Docker Container placing source into Shared Volume  
   This method is intended to using workflow on tweaking Swift build.
 
-  ### Build `sourcekit-builder` and `sourcekit:31` images
+  ### Build `sourcekit-builder` and `sourcekit:311` images
 ```sh
 # Build `sourcekit-builder` image
-$ docker build -t sourcekit-builder:31 https://github.com/norio-nomura/docker-sourcekit-builder.git
+$ docker build -t sourcekit-builder:311 https://github.com/norio-nomura/docker-sourcekit-builder.git
 # Build `sourcekit` image using context created by `sourcekit-builder`
-$ docker run --rm sourcekit-builder:31 context | docker build -t sourcekit:31 -
+$ docker run --rm sourcekit-builder:311 context | docker build -t sourcekit:311 -
 ```
 
 ### Build in the Docker Container placing source into Shared Volume
@@ -41,9 +41,9 @@ $ ./build-sourcekit-sv.sh
 **Docker for Mac has some issues on using shared volume that causes errors or stop on building Swift.**  
 See [Setup `docker-machine` on Mac](docker-machine-on-mac.md).
 
-## Build `SourceKitten` using `sourcekit:31` image
+## Build `SourceKitten` using `sourcekit:311` image
 ```sh
-$ docker run -it -v `pwd`:`pwd` -w `pwd`/SourceKitten sourcekit:31 bash
+$ docker run -it -v `pwd`:`pwd` -w `pwd`/SourceKitten sourcekit:311 bash
 > $ swift build
 > $ swift test
 ```

build-sourcekit-sv.sh

@@ -21,7 +21,7 @@ DOCKER_RUN_OPTIONS="-it -v ${WORK_DIR}:${WORK_DIR} -w ${WORK_DIR} --rm"
 SOURCEKIT_IMAGE="sourcekit:sv"
 REVISION="`git rev-parse --short HEAD|tr -d '\n'`"
 SRC_DIR=${WORK_DIR}/swift
-TOOLCHAIN_VERSION="swift-3.1-RELEASE-${REVISION}-with-sourcekit"
+TOOLCHAIN_VERSION="swift-3.1.1-RELEASE-${REVISION}-with-sourcekit"
 ARCHIVE="${TOOLCHAIN_VERSION}.tar.gz"
 SWIFT_INSTALLABLE_PACKAGE="${WORK_DIR}/build/${ARCHIVE}"
 SWIFT_INSTALL_DIR="${WORK_DIR}/build/swift-nightly-install"