new version Crashlytics

10 files changed, 112 insertions, 22 deletions

diff --git a/Libraries external/Fabric/Crashlytics.framework/Crashlytics b/Libraries external/Fabric/Crashlytics.framework/Crashlytics
index 79eb5165e..214fb9051 100755
--- a/Libraries external/Fabric/Crashlytics.framework/Crashlytics
+++ b/Libraries external/Fabric/Crashlytics.framework/Crashlytics
diff --git a/Libraries external/Fabric/Crashlytics.framework/Info.plist b/Libraries external/Fabric/Crashlytics.framework/Info.plist
index bfa283150..d86059be5 100644
--- a/Libraries external/Fabric/Crashlytics.framework/Info.plist
+++ b/Libraries external/Fabric/Crashlytics.framework/Info.plist
diff --git a/Libraries external/Fabric/Crashlytics.framework/run b/Libraries external/Fabric/Crashlytics.framework/run
index 9058ea62c..736cd2ff5 100755
--- a/Libraries external/Fabric/Crashlytics.framework/run
+++ b/Libraries external/Fabric/Crashlytics.framework/run
@@ -3,26 +3,71 @@
 #  run
 #
 #  Copyright (c) 2015 Crashlytics. All rights reserved.
+#
+#
+#  This script is meant to be run as a Run Script in the "Build Phases" section
+#  of your Xcode project. It sends debug symbols to symbolicate stacktraces,
+#  sends build events to track versions, and onboard apps for Crashlytics.
+#
+#  This script calls upload-symbols twice:
+#
+#  1) First it calls upload-symbols synchronously in "validation" mode. If the
+#     script finds issues with the build environment, it will report errors to Xcode.
+#     In validation mode it exits before doing any time consuming work.
+#
+#  2) Then it calls upload-symbols in the background to actually send the build
+#     event and upload symbols. It does this in the background so that it doesn't
+#     slow down your builds. If an error happens here, you won't see it in Xcode.
+#
+#  You can find the output for the background execution in Console.app, by
+#  searching for "upload-symbols".
+#
+#  If you want verbose output, you can pass the --debug flag to this script
+#
 
 #  Figure out where we're being called from
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
+#  If the first argument is specified without a dash, treat it as the Fabric API
+#  Key and add it as an argument
+if [ -z "$1" ] || [[ $1 == -* ]]; then
+  API_KEY_ARG=""
+else
+  API_KEY_ARG="-a $1"; shift
+fi
+
+#  If a second argument is specified without a dash, treat it as the Build Secret
+#  and add it as an argument
+if [ -z "$1" ] || [[ $1 == -* ]]; then
+  BUILD_SECRET_ARG=""
+else
+  BUILD_SECRET_ARG="-bs $1"; shift
+fi
+
+#  Build up the arguments list, passing through any flags added after the
+#  API Key and Build Secret
+ARGUMENTS="$API_KEY_ARG $BUILD_SECRET_ARG $@"
+VALIDATE_ARGUMENTS="$ARGUMENTS --build-phase --validate"
+UPLOAD_ARGUMENTS="$ARGUMENTS --build-phase"
 
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
-UPLOAD_COMMAND="uploadDSYM\" $@ run-script"
+# Quote the path to handle folders with special characters
+COMMAND_PATH="\"$DIR/upload-symbols\" "
 
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
+#  Ensure params are as expected, run in sync mode to validate,
+#  and cause a build error if validation fails
+eval $COMMAND_PATH$VALIDATE_ARGUMENTS
 return_code=$?
 
 if [[ $return_code != 0 ]]; then
   exit $return_code
 fi
 
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &
+#  Verification passed, convert and upload cSYMs in the background to prevent
+#  build delays
+#
+#  Note: Validation is performed again at this step before upload
+#
+#  Note: Output can still be found in Console.app, by searching for
+#        "upload-symbols"
+#
+eval $COMMAND_PATH$UPLOAD_ARGUMENTS > /dev/null 2>&1 &
diff --git a/Libraries external/Fabric/Crashlytics.framework/upload-symbols b/Libraries external/Fabric/Crashlytics.framework/upload-symbols
new file mode 100755
index 000000000..5af65decc
--- /dev/null
+++ b/Libraries external/Fabric/Crashlytics.framework/upload-symbols
diff --git a/Libraries external/Fabric/Crashlytics.framework/uploadDSYM b/Libraries external/Fabric/Crashlytics.framework/uploadDSYM
deleted file mode 100755
index 8deb7c9c3..000000000
--- a/Libraries external/Fabric/Crashlytics.framework/uploadDSYM
+++ /dev/null
diff --git a/Libraries external/Fabric/Fabric.framework/Fabric b/Libraries external/Fabric/Fabric.framework/Fabric
index f04d6f916..aa394a3de 100755
--- a/Libraries external/Fabric/Fabric.framework/Fabric
+++ b/Libraries external/Fabric/Fabric.framework/Fabric
diff --git a/Libraries external/Fabric/Fabric.framework/Info.plist b/Libraries external/Fabric/Fabric.framework/Info.plist
index 60b3b6abb..a617b035f 100644
--- a/Libraries external/Fabric/Fabric.framework/Info.plist
+++ b/Libraries external/Fabric/Fabric.framework/Info.plist
diff --git a/Libraries external/Fabric/Fabric.framework/run b/Libraries external/Fabric/Fabric.framework/run
index 9058ea62c..736cd2ff5 100755
--- a/Libraries external/Fabric/Fabric.framework/run
+++ b/Libraries external/Fabric/Fabric.framework/run
@@ -3,26 +3,71 @@
 #  run
 #
 #  Copyright (c) 2015 Crashlytics. All rights reserved.
+#
+#
+#  This script is meant to be run as a Run Script in the "Build Phases" section
+#  of your Xcode project. It sends debug symbols to symbolicate stacktraces,
+#  sends build events to track versions, and onboard apps for Crashlytics.
+#
+#  This script calls upload-symbols twice:
+#
+#  1) First it calls upload-symbols synchronously in "validation" mode. If the
+#     script finds issues with the build environment, it will report errors to Xcode.
+#     In validation mode it exits before doing any time consuming work.
+#
+#  2) Then it calls upload-symbols in the background to actually send the build
+#     event and upload symbols. It does this in the background so that it doesn't
+#     slow down your builds. If an error happens here, you won't see it in Xcode.
+#
+#  You can find the output for the background execution in Console.app, by
+#  searching for "upload-symbols".
+#
+#  If you want verbose output, you can pass the --debug flag to this script
+#
 
 #  Figure out where we're being called from
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-#  Quote path in case of spaces or special chars
-DIR="\"${DIR}"
+#  If the first argument is specified without a dash, treat it as the Fabric API
+#  Key and add it as an argument
+if [ -z "$1" ] || [[ $1 == -* ]]; then
+  API_KEY_ARG=""
+else
+  API_KEY_ARG="-a $1"; shift
+fi
+
+#  If a second argument is specified without a dash, treat it as the Build Secret
+#  and add it as an argument
+if [ -z "$1" ] || [[ $1 == -* ]]; then
+  BUILD_SECRET_ARG=""
+else
+  BUILD_SECRET_ARG="-bs $1"; shift
+fi
+
+#  Build up the arguments list, passing through any flags added after the
+#  API Key and Build Secret
+ARGUMENTS="$API_KEY_ARG $BUILD_SECRET_ARG $@"
+VALIDATE_ARGUMENTS="$ARGUMENTS --build-phase --validate"
+UPLOAD_ARGUMENTS="$ARGUMENTS --build-phase"
 
-PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
-UPLOAD_COMMAND="uploadDSYM\" $@ run-script"
+# Quote the path to handle folders with special characters
+COMMAND_PATH="\"$DIR/upload-symbols\" "
 
-#  Ensure params are as expected, run in sync mode to validate
-eval $DIR$PATH_SEP$VALIDATE_COMMAND
+#  Ensure params are as expected, run in sync mode to validate,
+#  and cause a build error if validation fails
+eval $COMMAND_PATH$VALIDATE_ARGUMENTS
 return_code=$?
 
 if [[ $return_code != 0 ]]; then
   exit $return_code
 fi
 
-#  Verification passed, upload dSYM in background to prevent Xcode from waiting
-#  Note: Validation is performed again before upload.
-#  Output can still be found in Console.app
-eval $DIR$PATH_SEP$UPLOAD_COMMAND > /dev/null 2>&1 &
+#  Verification passed, convert and upload cSYMs in the background to prevent
+#  build delays
+#
+#  Note: Validation is performed again at this step before upload
+#
+#  Note: Output can still be found in Console.app, by searching for
+#        "upload-symbols"
+#
+eval $COMMAND_PATH$UPLOAD_ARGUMENTS > /dev/null 2>&1 &
diff --git a/Libraries external/Fabric/Fabric.framework/upload-symbols b/Libraries external/Fabric/Fabric.framework/upload-symbols
new file mode 100755
index 000000000..a18d0b68f
--- /dev/null
+++ b/Libraries external/Fabric/Fabric.framework/upload-symbols
diff --git a/Libraries external/Fabric/Fabric.framework/uploadDSYM b/Libraries external/Fabric/Fabric.framework/uploadDSYM
deleted file mode 100755
index 441f46515..000000000
--- a/Libraries external/Fabric/Fabric.framework/uploadDSYM
+++ /dev/null