From 783b0b8c10738fa352ecc191bf080ece6011e79a Mon Sep 17 00:00:00 2001
From: Nikita Lutsenko <nlutsenko@me.com>
Date: Fri, 8 Jul 2016 16:32:58 -0700
Subject: [PATCH 1/2] Unbreak packaging script.

---
 scripts/build_framework.sh | 14 +++++++-------
 scripts/common.sh          |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh
index 5364b7087..b7534aa27 100755
--- a/scripts/build_framework.sh
+++ b/scripts/build_framework.sh
@@ -76,7 +76,7 @@ test -x "$XCODEBUILD" || die 'Could not find xcodebuild in $PATH'
 test -x "$LIPO" || die 'Could not find lipo in $PATH'
 
 BOLTS_IOS_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}-universal/Bolts.framework/Bolts
-BOLTS_OSX_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}/Bolts.framework
+BOLTS_MACOS_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}/Bolts.framework
 BOLTS_TVOS_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}-appletv-universal/Bolts.framework/Bolts
 BOLTS_WATCHOS_BINARY=$BOLTS_BUILD/${BUILDCONFIGURATION}-watch-universal/Bolts.framework/Bolts
 
@@ -95,9 +95,9 @@ test -d "$BOLTS_IOS_BUILD" \
   || mkdir -p "$BOLTS_IOS_BUILD" \
   || die "Could not create directory $BOLTS_IOS_BUILD"
 
-test -d "$BOLTS_OSX_BUILD" \
-  || mkdir -p "$BOLTS_OSX_BUILD" \
-  || die "Could not create directory $BOLTS_OSX_BUILD"
+test -d "$BOLTS_MACOS_BUILD" \
+  || mkdir -p "$BOLTS_MACOS_BUILD" \
+  || die "Could not create directory $BOLTS_MACOS_BUILD"
 
 if [ $WATCHOS -eq 1 ]; then
   test -d "$BOLTS_WATCHOS_BUILD" \
@@ -126,7 +126,7 @@ function xcode_build_target() {
 
 xcode_build_target "iphonesimulator" "${BUILDCONFIGURATION}" "Bolts-iOS"
 xcode_build_target "iphoneos" "${BUILDCONFIGURATION}" "Bolts-iOS"
-xcode_build_target "macosx" "${BUILDCONFIGURATION}" "Bolts-OSX"
+xcode_build_target "macosx" "${BUILDCONFIGURATION}" "Bolts-macOS"
 if [ $WATCHOS -eq 1 ]; then
   xcode_build_target "watchsimulator" "${BUILDCONFIGURATION}" "Bolts-watchOS"
   xcode_build_target "watchos" "${BUILDCONFIGURATION}" "Bolts-watchOS"
@@ -204,8 +204,8 @@ fi
 # Copy/Paste created iOS Framework to final location
 cp -av "$(dirname "$BOLTS_IOS_BINARY")" $BOLTS_IOS_FRAMEWORK
 
-# Copy/Paste OSX framework, as this is already built for us
-cp -av "$BOLTS_OSX_BINARY" $BOLTS_OSX_FRAMEWORK
+# Copy/Paste macOS framework, as this is already built for us
+cp -av "$BOLTS_MACOS_BINARY" $BOLTS_MACOS_FRAMEWORK
 
 if [ $WATCHOS -eq 1 ]; then
   # Copy/Paste watchOS Framework
diff --git a/scripts/common.sh b/scripts/common.sh
index 26746e1bc..cf1de45d2 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -47,7 +47,7 @@ if [ -z "$BOLTS_SCRIPT" ]; then
   # The directory where the target is built
   BOLTS_BUILD=$BOLTS_ROOT/build
   BOLTS_IOS_BUILD=$BOLTS_ROOT/build/ios
-  BOLTS_OSX_BUILD=$BOLTS_ROOT/build/osx
+  BOLTS_MACOS_BUILD=$BOLTS_ROOT/build/osx
   BOLTS_WATCHOS_BUILD=$BOLTS_ROOT/build/watchOS
   BOLTS_TVOS_BUILD=$BOLTS_ROOT/build/tvOS
   BOLTS_BUILD_LOG=$BOLTS_BUILD/build.log
@@ -57,7 +57,7 @@ if [ -z "$BOLTS_SCRIPT" ]; then
 
   # The path to the built Bolts .framework file
   BOLTS_IOS_FRAMEWORK=$BOLTS_IOS_BUILD/$BOLTS_FRAMEWORK_NAME
-  BOLTS_OSX_FRAMEWORK=$BOLTS_OSX_BUILD/$BOLTS_FRAMEWORK_NAME
+  BOLTS_MACOS_FRAMEWORK=$BOLTS_MACOS_BUILD/$BOLTS_FRAMEWORK_NAME
   BOLTS_WATCHOS_FRAMEWORK=$BOLTS_WATCHOS_BUILD/$BOLTS_FRAMEWORK_NAME
   BOLTS_TVOS_FRAMEWORK=$BOLTS_TVOS_BUILD/$BOLTS_FRAMEWORK_NAME
 

From b4b14574842173c47c1e8c2a0627e2bad36a19ef Mon Sep 17 00:00:00 2001
From: Nikita Lutsenko <nlutsenko@me.com>
Date: Fri, 8 Jul 2016 16:37:06 -0700
Subject: [PATCH 2/2] Make macOS tests run again on Travis-CI.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e1a4cf89..fb0c7b430 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
     - TEST_TYPE=Carthage
 before_install:
 - |
-  if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = OSX ] || [ "$TEST_TYPE" = tvOS ]; then
+  if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ] || [ "$TEST_TYPE" = tvOS ]; then
     gem install xcpretty -N --no-ri --no-rdoc
   elif [ "$TEST_TYPE" = CocoaPods ]; then
     gem install cocoapods --pre --quiet --no-ri --no-rdoc
@@ -30,7 +30,7 @@ script:
     if [ "$TEST_TYPE" = iOS ]; then
       set -o pipefail
       xcodebuild test -project Bolts.xcodeproj -sdk iphonesimulator -scheme Bolts-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
-    elif [ "$TEST_TYPE" = OSX ]; then
+    elif [ "$TEST_TYPE" = macOS ]; then
       set -o pipefail
       xcodebuild test -project Bolts.xcodeproj -sdk macosx -scheme Bolts-macOS -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
     elif [ "$TEST_TYPE" = tvOS ]; then