Skip to content

Commit

Permalink
Swift 4.2.2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Compton committed Feb 12, 2019
1 parent 71670dc commit bd5edca
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ OK
Starting app Kitura-Starter in org [email protected] / space dev as [email protected]...
-----> Downloaded app package (28K)
Cloning into '/tmp/buildpacks/swift-buildpack'...
-----> Buildpack version 2.0.16
-----> Default supported Swift version is 4.2.1
-----> Buildpack version 2.0.17
-----> Default supported Swift version is 4.2.2
-----> Configure for apt-get installs...
-----> Downloading system level dependencies...
-----> Fetching .debs for: libicu-dev libcurl4-openssl-dev
Expand Down Expand Up @@ -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.16](https://github.com/IBM-Swift/swift-buildpack/releases/tag/2.0.16).
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).
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:
Expand Down Expand Up @@ -220,21 +220,21 @@ command: <executable_name>
### What is the latest version of Swift supported?
The latest version of Swift supported by this buildpack is ```4.2.1```.
The latest version of Swift supported by this buildpack is ```4.2.2```.
### Specify a Swift version
You specify the version of Swift for your application using a `.swift-version` file in the root of your repository:
```shell
$ cat .swift-version
4.2.1
4.2.2
```
Please note that the swift_buildpack installed on the IBM Cloud **caches** the following versions of the Swift binaries:
- `4.2.2`
- `4.2.1`
- `4.2`
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.
Expand Down Expand Up @@ -389,15 +389,15 @@ Admin tasks
To install this buildpack:
```shell
wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.16/buildpack_swift_v2.0.16-20181214-0434.zip
ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.16-20181214-0434.zip <position>
wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.17/buildpack_swift_v2.0.17-20181214-0434.zip
ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.17-20181214-0434.zip <position>
```
And to update it:
```shell
wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.16/buildpack_swift_v2.0.16-20181214-0434.zip
ibmcloud cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.16-20181214-0434.zip
wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.17/buildpack_swift_v2.0.17-20181214-0434.zip
ibmcloud cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.17-20181214-0434.zip
```
For more details on installing buildpacks, see [Adding buildpacks to Cloud Foundry](https://docs.cloudfoundry.org/adminguide/buildpacks.html).
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.16
2.0.17
2 changes: 1 addition & 1 deletion lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
##

# Global/common vars
DEFAULT_SWIFT_VERSION=4.2.1
DEFAULT_SWIFT_VERSION=4.2.2
CLANG_VERSION=4.0.0

error() {
Expand Down
12 changes: 6 additions & 6 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ url_to_dependency_map:

dependencies:
- 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: swift
version: 4.2
uri: https://swift.org/builds/swift-4.2-release/ubuntu1404/swift-4.2-RELEASE/swift-4.2-RELEASE-ubuntu14.04.tar.gz
md5: a3c9202ebde0d089a7bdd15da66956ed
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
cf_stacks:
- cflinuxfs2
- name: clang
Expand Down
2 changes: 1 addition & 1 deletion spec/shell_wrapper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.1' }
let(:default_swift_version) { '4.2.2' }

describe '#install_packages' do
context 'deb file exists in $APT_CACHE_DIR/archives' do
Expand Down

0 comments on commit bd5edca

Please sign in to comment.