upgrading cf commands

Author: Christian Compton

README.md

@@ -13,8 +13,8 @@ Usage
 Example usage (see the [Specify a Swift version](#specify-a-swift-version) section):
 
 ```shell
-$ bx app push
-Invoking 'cf push'...
+$ ibmcloud app push
+Invoking 'ibmcloud app push'...
 
 Using manifest file /Users/olivieri/git/Kitura-Starter/manifest.yml
 
@@ -183,10 +183,10 @@ The buildpack will detect your app as Swift if it has a `Package.swift` file in
 
 The latest version of the IBM Cloud buildpack for Swift on the IBM Cloud is [v2.0.13](https://github.com/IBM-Swift/swift-buildpack/releases/tag/2.0.13).
 
-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 `bx app push` command, as shown below:
+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:
 
 ```shell
-bx app push -b https://github.com/IBM-Swift/swift-buildpack
+ibmcloud app push -b https://github.com/IBM-Swift/swift-buildpack
 ```
 
 ### Procfile
@@ -353,18 +353,18 @@ Previous versions of this buildpack provided the [libdispatch](https://github.co
 
 ### Caching of the .build directory
 
-Following the release of Swift 3.1, the IBM Cloud buildpack for Swift caches the contents of the `.build` folder to speed up the provisioning of your application the next time you execute the `bx app push` command. If you'd prefer not to use this caching mechanism, you can disable it by executing the following command:
+Following the release of Swift 3.1, the IBM Cloud buildpack for Swift caches the contents of the `.build` folder to speed up the provisioning of your application the next time you execute the `ibmcloud app push` command. If you'd prefer not to use this caching mechanism, you can disable it by executing the following command:
 
 ```shell
-bx app env-set <app_name> SWIFT_BUILD_DIR_CACHE false
-bx app restage <app_name>
+ibmcloud app env-set <app_name> SWIFT_BUILD_DIR_CACHE false
+ibmcloud app restage <app_name>
 ```
 
 If at some point, you'd like to re-enable caching of the `.build` folder, you can do so by executing:
 
 ```shell
-bx app env-set <app_name> SWIFT_BUILD_DIR_CACHE true
-bx app restage <app_name>
+ibmcloud app env-set <app_name> SWIFT_BUILD_DIR_CACHE true
+ibmcloud app restage <app_name>
 ```
 
 Note that if at some point you change the contents of your `Package.swift` or `Package.resolved` (or `Package.pins` for older versions of Swift) file, the buildpack will automatically refetch the dependencies and update the cache accordingly. Also, if you do not initially push a `Package.resolved` file along with your application and you are using Swift 4.0 (or a later version), a new `Package.resolved` file will be generated. It is recommended that you always push a `Package.resolved` file along with your application (if using Swift 4.0 or later).
@@ -374,13 +374,13 @@ Note that if at some point you change the contents of your `Package.swift` or `P
 If the buildpack preparation or compilation steps are failing, you can enable some debugging using the following command:
 
 ```shell
-bx app env-set <app_name> BP_DEBUG true
+ibmcloud app env-set <app_name> BP_DEBUG true
 ```
 
 To deactivate:
 
 ```shell
-bx app env-unset <app_name> BP_DEBUG
+ibmcoud app env-unset <app_name> BP_DEBUG
 ```
 
 ### Installing Personal Package Archives
@@ -393,14 +393,14 @@ To install this buildpack:
 
 ```shell
 wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.13/buildpack_swift_v2.0.13-20180510-1828.zip
-bx cf create-buildpack swift_buildpack buildpack_swift_v2.0.13-20180510-1828.zip <position>
+ibmcloud cf create-buildpack swift_buildpack buildpack_swift_v2.0.13-20180510-1828.zip <position>
 ```
 
 And to update it:
 
 ```shell
 wget https://github.com/IBM-Swift/swift-buildpack/releases/download/2.0.13/buildpack_swift_v2.0.13-20180510-1828.zip
-bx cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.13-20180510-1828.zip
+ibmcloud cf update-buildpack swift_buildpack -p buildpack_swift_v2.0.13-20180510-1828.zip
 ```
 
 For more details on installing buildpacks, see [Adding buildpacks to Cloud Foundry](https://docs.cloudfoundry.org/adminguide/buildpacks.html).

ci/performance_validator.sh

@@ -28,19 +28,19 @@ push_application () {
 	local RETVAL=1
 
 	if [ "$DELETE_FLAG" = true ]; then
-		echo "Executing cf push tests..."
+		echo "Executing ibmcloud push tests..."
 		echo "Clearing out any previous instances of: $APPLICATION_DIR"
-		cf delete $APPLICATION_DIR -r -f
+		ibmcloud app delete $APPLICATION_DIR -r -f
 	else
-		echo "Executing cf re-push tests..."
+		echo "Executing ibmcloud re-push tests..."
 	fi
 
 	echo "$APPLICATION_DIR threshold value is: $TIMEOUT"
 	echo
 
 	for num in `seq 1 $TIMES_TO_REPEAT`; do
 		START_TIME=$SECONDS
-		cf push -b https://github.com/IBM-Swift/swift-buildpack.git#$TRAVIS_BRANCH
+		ibmcloud app push -b https://github.com/IBM-Swift/swift-buildpack.git#$TRAVIS_BRANCH
 		ELAPSED_TIME=$(($SECONDS - $START_TIME))
 
 		echo "$APPLICATION_DIR took $ELAPSED_TIME seconds."
@@ -50,7 +50,7 @@ push_application () {
 			RETVAL=0
 			break
 		elif [ "$DELETE_FLAG" = true ]; then
-			cf delete $APPLICATION_DIR -r -f
+			ibmcloud app delete $APPLICATION_DIR -r -f
 		fi
 
 		echo "$APPLICATION_DIR took longer than the threshold value."
@@ -72,7 +72,7 @@ if [ $passed -ne 0 ] || [ $passed_repush -ne 0 ]; then
 	exit 1
 fi
 
-cf app $APPLICATION_DIR
+ibmcloud app show $APPLICATION_DIR
 
 # Unfortunately, attempting to validate the http code
 # sometimes results in false positives, which fails our CI builds.