Skip to content

Commit 49b10fd

Browse files
committed
Adding version info to detect output
1 parent 5e6d344 commit 49b10fd

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

bin/compile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ PACKAGES_DIR="Packages"
3838

3939
# Check environment support
4040
$compile_buildpack_dir/compile-extensions/bin/check_stack_support
41-
# Load global vars
42-
source $compile_buildpack_dir/lib/globals.sh
4341
# Load convenience functions like status(), echo(), and indent()
44-
source $compile_buildpack_dir/lib/utils.sh
42+
source $compile_buildpack_dir/lib/common.sh
4543
# Load caching functions
4644
source ${compile_buildpack_dir}/lib/cache.sh
4745

bin/detect

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ set -e
2323
BP_DIR=$(cd $(dirname $0); cd ..; pwd)
2424
APP_DIR=$1
2525

26-
# Load global vars
27-
source $BP_DIR/lib/globals.sh
2826
# Load convenience functions
29-
source $BP_DIR/lib/utils.sh
27+
source $BP_DIR/lib/common.sh
3028

3129
if [[ -f $APP_DIR/Package.swift ]]; then
3230
swift_version="$(get_swift_version)"

lib/utils.sh renamed to lib/common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# limitations under the License.
1515
##
1616

17+
# Global/common vars
18+
DEFAULT_SWIFT_VERSION=3.0.2
19+
CLANG_VERSION=3.8.0
20+
1721
error() {
1822
echo " ! $*" >&2
1923
exit 1

lib/globals.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)