From 7967872d4e5bc80e53d4ec9491de2fab57afc36d Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Sun, 3 Mar 2019 11:44:50 -0600 Subject: [PATCH] Swift 4.2.3 --- README.md | 20 ++++++++++---------- VERSION | 2 +- lib/common.sh | 2 +- manifest.yml | 12 ++++++------ spec/shell_wrapper_spec.rb | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 2022782f..d6640105 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ OK Starting app Kitura-Starter in org roliv@us.ibm.com / space dev as roliv@us.ibm.com... -----> Downloaded app package (28K) Cloning into '/tmp/buildpacks/swift-buildpack'... ------> Buildpack version 2.0.17 ------> Default supported Swift version is 4.2.2 +-----> Buildpack version 2.0.18 +-----> Default supported Swift version is 4.2.3 -----> Configure for apt-get installs... -----> Downloading system level dependencies... -----> Fetching .debs for: libicu-dev libcurl4-openssl-dev @@ -178,7 +178,7 @@ The buildpack will detect your app as Swift if it has a `Package.swift` file in ### Version installed on the IBM Cloud -The latest version of the IBM Cloud buildpack for Swift on the IBM Cloud is [v2.0.17](https://github.com/IBM-Swift/swift-buildpack/releases/tag/2.0.17). +The latest version of the IBM Cloud buildpack for Swift on the IBM Cloud is [v2.0.18](https://github.com/IBM-Swift/swift-buildpack/releases/tag/2.0.18). Please note that it is possible that the latest buildpack code contained in this repo hasn't yet been installed on the IBM Cloud. If that happens to be the case and you'd like to leverage the latest buildpack code, you can do so by adding the `-b https://github.com/IBM-Swift/swift-buildpack` parameter to the `ibmcloud app push` command, as shown below: @@ -220,7 +220,7 @@ command: ### What is the latest version of Swift supported? -The latest version of Swift supported by this buildpack is ```4.2.2```. +The latest version of Swift supported by this buildpack is ```4.2.3```. ### Specify a Swift version @@ -228,13 +228,13 @@ You specify the version of Swift for your application using a `.swift-version` f ```shell $ cat .swift-version -4.2.2 +4.2.3 ``` Please note that the swift_buildpack installed on the IBM Cloud **caches** the following versions of the Swift binaries: +- `4.2.3` - `4.2.2` -- `4.2.1` If you'd like to use a different version of Swift [that is not cached] on the IBM Cloud, you can specify it in the `.swift-version` file. Please be aware that using a Swift version that is not cached increases the provisioning time of your app on the IBM Cloud. @@ -389,8 +389,8 @@ Admin tasks To install this buildpack: ```shell -wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.17/buildpack_swift_v2.0.17-20190212-2123.zip -ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.17-20190212-2123.zip +wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.18/buildpack_swift_v2.0.18-20190212-2123.zip +ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.18-20190212-2123.zip ``` **Position** is a positive integer, sets priority, and is sorted from lowest to highest when listed using the `ibmcloud cf buildpacks` command. @@ -398,8 +398,8 @@ ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.17-20190212-21 And to update it: ```shell -wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.17/buildpack_swift_v2.0.17-20190212-2123.zip -ibmcloud cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.17-20190212-2123.zip +wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.18/buildpack_swift_v2.0.18-20190212-2123.zip +ibmcloud cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.18-20190212-2123.zip ``` For more details on installing buildpacks, see [Adding buildpacks to Cloud Foundry](https://docs.cloudfoundry.org/adminguide/buildpacks.html). diff --git a/VERSION b/VERSION index a6e7bcb3..c945ef14 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.17 +2.0.18 diff --git a/lib/common.sh b/lib/common.sh index c0e121e5..e0befcff 100755 --- a/lib/common.sh +++ b/lib/common.sh @@ -15,7 +15,7 @@ ## # Global/common vars -DEFAULT_SWIFT_VERSION=4.2.2 +DEFAULT_SWIFT_VERSION=4.2.3 CLANG_VERSION=4.0.0 error() { diff --git a/manifest.yml b/manifest.yml index 99ce1f40..31fdbec3 100644 --- a/manifest.yml +++ b/manifest.yml @@ -26,15 +26,15 @@ url_to_dependency_map: dependencies: - name: swift - version: 4.2.2 - uri: https://swift.org/builds/swift-4.2.2-release/ubuntu1404/swift-4.2.2-RELEASE/swift-4.2.2-RELEASE-ubuntu14.04.tar.gz - md5: 7220da15d874e64ee5335661bc4b666f + version: 4.2.3 + uri: https://swift.org/builds/swift-4.2.3-release/ubuntu1404/swift-4.2.3-RELEASE/swift-4.2.3-RELEASE-ubuntu14.04.tar.gz + md5: 5fc24ed16b76f5b716d3a00a911f5d0c cf_stacks: - cflinuxfs2 - name: swift - version: 4.2.1 - uri: https://swift.org/builds/swift-4.2.1-release/ubuntu1404/swift-4.2.1-RELEASE/swift-4.2.1-RELEASE-ubuntu14.04.tar.gz - md5: 3bcacbaa834f1f89cc101997d0ccba27 + version: 4.2.2 + uri: https://swift.org/builds/swift-4.2.2-release/ubuntu1404/swift-4.2.2-RELEASE/swift-4.2.2-RELEASE-ubuntu14.04.tar.gz + md5: 7220da15d874e64ee5335661bc4b666f cf_stacks: - cflinuxfs2 - name: clang diff --git a/spec/shell_wrapper_spec.rb b/spec/shell_wrapper_spec.rb index c0c55d6c..af639812 100644 --- a/spec/shell_wrapper_spec.rb +++ b/spec/shell_wrapper_spec.rb @@ -14,7 +14,7 @@ module ShellWrapper let(:apt_cache_dir) { Dir.mktmpdir } let(:buildpack_dir) { File.join(File.dirname(__FILE__), '../') } let(:common_shell_script) { File.join(buildpack_dir, 'lib', 'common.sh') } - let(:default_swift_version) { '4.2.2' } + let(:default_swift_version) { '4.2.3' } describe '#install_packages' do context 'deb file exists in $APT_CACHE_DIR/archives' do