cleaned up build system a bit

Cartfile

@@ -0,0 +1,2 @@
+binary "https://bitbucket.org/twocanoes/productlicense-public/downloads/productlicense.json"
+github "PaddleHQ/Mac-Framework-V4"

build.sh

@@ -1,5 +1,12 @@
-#!/bin/bash
+#!/bin/bash 
+
+set -e
+
+carthage update
+xcodebuild -resolvePackageDependencies
 
 pushd ./build_resources/buildscripts/
+
 SKIP_DMG=1 ./build.sh
+
 popd

build_resources/buildscripts/build.sh

@@ -7,8 +7,12 @@ PROJECT_FOLDER="../../"
 SRC_PATH="../../"
 
 ###########################
-source "${SRC_PATH}/../build/bitbucket_creds.sh"
-osascript -e 'tell application "DropDMG" to get version'
+if [ -e "${SRC_PATH}/../build/bitbucket_creds.sh" ] ; then 
+	source "${SRC_PATH}/../build/bitbucket_creds.sh"
+fi
+if [ -e /Applications/DropDMG.app ]; then 
+	osascript -e 'tell application "DropDMG" to get version'
+fi
 
 pushd ../..
 agvtool next-version -all
@@ -20,8 +24,6 @@ temp_folder=$(mktemp -d "/tmp/${PRODUCT_NAME}.XXXXXXXX")
 BUILD_FOLDER="${temp_folder}/build"
 
 
-
-
 xcodebuild archive -project "${SRC_PATH}/${PRODUCT_NAME}.xcodeproj" -scheme "${PRODUCT_NAME}" -archivePath  "${temp_folder}/${PRODUCT_NAME}.xcarchive"
 
 
@@ -37,5 +39,7 @@ cp -R "${temp_folder}/${PRODUCT_NAME}.xcarchive/dSYMs/" "${PROJECT_FOLDER}/produ
 
 cp -Rv "${SRC_PATH}/build_resources/" "${BUILD_FOLDER}"
 
-
-/Users/tperfitt/Documents/Projects/build/build.sh  "${BUILD_FOLDER}" "${temp_folder}" "${PRODUCT_NAME}" "${BUILD_FOLDER}/XCreds.app" "${SCRIPT_FOLDER}/build_post.sh"
+echo "output is in ${BUILD_FOLDER}"
+if [ -e /Users/tperfitt/Documents/Projects/build/build.sh ] ; then 
+	/Users/tperfitt/Documents/Projects/build/build.sh  "${BUILD_FOLDER}" "${temp_folder}" "${PRODUCT_NAME}" "${BUILD_FOLDER}/XCreds.app" "${SCRIPT_FOLDER}/build_post.sh"
+fi

xCreds.xcodeproj/project.pbxproj

@@ -1005,7 +1005,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1042,7 +1042,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1107,7 +1107,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1143,7 +1143,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1292,7 +1292,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1327,7 +1327,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3607;
+				CURRENT_PROJECT_VERSION = 3614;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (