Revert "Updates build scripts."

This reverts commit 466b41b.

Author: Guido Marucci Blas

script/.env

@@ -1,4 +1,4 @@
-REQUIRED_CARTHAGE_VERSION=0.9.2
+
 PROJECT_NAME=ReactiveArray
 XCODE_SCHEME=ReactiveArray
 XCODE_WORKSPACE=

script/bootstrap

@@ -87,7 +87,6 @@ bundle_install ()
            "or try to install the gems globally by running the following command:"
     print_gem_install_cmd
     printf "\033[0m"
-    exit 1
   fi
 }
 
@@ -166,21 +165,6 @@ install_dependencies ()
   fi
 }
 
-install_carthage ()
-{
-  source script/common/carthage
-
-  if type carthage > /dev/null
-  then
-    echo ""
-    echo " → Checking installed version of carthage"
-    echo ""
-    check_carthage_version
-  else
-    force_install_carthage
-  fi
-}
-
 main ()
 {
   source script/.env
@@ -194,7 +178,7 @@ main ()
 
   if [ -f Cartfile ]
   then
-    install_carthage
+    brew_install "carthage"
     bootstrap_carthage
   fi
 

script/build

@@ -2,11 +2,8 @@
 
 set -e
 
-source script/common/carthage
-
 build_using_carthage ()
 {
-  check_carthage_version
   carthage_cmd="carthage build --no-skip-current --platform ios"
   if [ "$USE_SSH" == "true" ]
   then

script/cibuild

@@ -1,30 +1,99 @@
 #!/bin/bash
 
-echo ""
-echo "####### Bootstrap Phase #######"
-echo ""
-NO_CARTHAGE_UPDATE=true script/bootstrap
-status=$?
-
-if [ $status -eq 0 ]
-then
-  echo ""
-  echo ""
-  echo "####### Build & Test Phase #######"
-  echo ""
-  set -o pipefail && script/test 2>&1 | tee /tmp/build.test-output.txt
-  status=$?
-  if [ ! $status -eq 0 ]
-  then
-    log_file_path=`cat /tmp/build.test-output.txt | tail -n 100 | perl -l -ne '/(\/var\/folders.*\/com\.apple\.dt\.XCTest-status.*)\)/ && print $1'`
-    if [ ! -z "$log_file_path" ]
+export SCRIPT_DIR=$(dirname "$0")
+
+##
+## Configuration Variables
+##
+
+# The name of the keychain to create for iOS code signing.
+KEYCHAIN=ios-build.keychain
+
+##
+## Build Process
+##
+
+main ()
+{
+    if [ -f Cartfile ]
+    then
+      echo ""
+      echo "####### Importing Developer Certificates #######"
+      echo ""
+      import_certs
+    fi
+
+    echo ""
+    echo "####### Bootstrap Phase #######"
+    echo ""
+    script/bootstrap
+    local status=$?
+
+    if [ $status -eq 0 ]
     then
       echo ""
-      echo " → The tests have failed. Printing output of log file '$log_file_path'."
-      cat $log_file_path
       echo ""
+      echo "####### Build & Test Phase #######"
+      echo ""
+      set -o pipefail && script/test 2>&1 | tee /tmp/build.test-output.txt
+      status=$?
+      if [ ! $status -eq 0 ]
+      then
+        log_file_path=`cat /tmp/build.test-output.txt | tail -n 100 | perl -l -ne '/(\/var\/folders.*\/com\.apple\.dt\.XCTest-status.*)\)/ && print $1'`
+        if [ ! -z "$log_file_path" ]
+        then
+          echo ""
+          echo " → The tests have failed. Printing output of log file '$log_file_path'."
+          cat $log_file_path
+          echo ""
+        fi
+      fi
+    fi
+
+    delete_keychain
+    exit $status
+}
+
+import_certs ()
+{
+    # If this environment variable is missing, we must not be running on Travis.
+    if [ -z "$KEY_PASSWORD" ]
+    then
+        return 0
+    fi
+
+    echo " → Setting up code signing..."
+    local password=cibuild
+
+    # Create a temporary keychain for code signing.
+    security create-keychain -p "$password" "$KEYCHAIN"
+    security default-keychain -s "$KEYCHAIN"
+    security unlock-keychain -p "$password" "$KEYCHAIN"
+    security set-keychain-settings -t 3600 -l "$KEYCHAIN"
+
+    # Download the certificate for the Apple Worldwide Developer Relations
+    # Certificate Authority.
+    local certpath="$SCRIPT_DIR/apple_wwdr.cer"
+    curl -s 'https://developer.apple.com/certificationauthority/AppleWWDRCA.cer' > "$certpath"
+    security import "$certpath" -k "$KEYCHAIN" -T /usr/bin/codesign
+
+    # Import our development certificate.
+    security import "$SCRIPT_DIR/certificates/cibot.p12" -k "$KEYCHAIN" -P "$KEY_PASSWORD" -T /usr/bin/codesign
+}
+
+delete_keychain ()
+{
+    if [ -z "$KEY_PASSWORD" ]
+    then
+        return 0
     fi
-  fi
-fi
 
-exit $status
+    echo " → Removing temporary keychain"
+    security delete-keychain "$KEYCHAIN"
+    echo "    ✔ Temporary keychain successfully removed."
+}
+
+export -f import_certs
+export -f delete_keychain
+
+main

script/common/carthage

@@ -4,7 +4,6 @@ set -e
 
 source script/.env
 source script/script_hooks/schemes
-source script/common/carthage
 
 run_tests ()
 {
@@ -39,11 +38,6 @@ run_tests ()
   eval $test_command
 }
 
-if [ -f Cartfile ]
-then
-  check_carthage_version
-fi
-
 current_schemes=$(schemes)
 if [ -z "$current_schemes" ]
 then

script/test

@@ -3,11 +3,9 @@
 set -e
 
 source script/.env
-source script/common/carthage
 
 if [ -f Cartfile ] && type carthage > /dev/null
 then
-  check_carthage_version
   carthage_cmd="carthage update --platform ios"
   if [ "$USE_SSH" == "true" ]
   then