diff --git a/Crashlytics.framework/Crashlytics b/Crashlytics.framework/Crashlytics index e5a85e3..40a6046 100755 Binary files a/Crashlytics.framework/Crashlytics and b/Crashlytics.framework/Crashlytics differ diff --git a/Crashlytics.framework/Info.plist b/Crashlytics.framework/Info.plist index ab886b6..f988851 100644 Binary files a/Crashlytics.framework/Info.plist and b/Crashlytics.framework/Info.plist differ diff --git a/Crashlytics.framework/run b/Crashlytics.framework/run index 9058ea6..736cd2f 100755 --- a/Crashlytics.framework/run +++ b/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/Fabric.framework/Fabric b/Fabric.framework/Fabric index ffaceb6..aa394a3 100755 Binary files a/Fabric.framework/Fabric and b/Fabric.framework/Fabric differ diff --git a/Fabric.framework/Info.plist b/Fabric.framework/Info.plist index 2b862ba..a617b03 100644 Binary files a/Fabric.framework/Info.plist and b/Fabric.framework/Info.plist differ diff --git a/Fabric.framework/run b/Fabric.framework/run index 9058ea6..736cd2f 100755 --- a/Fabric.framework/run +++ b/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/Podfile.lock b/Podfile.lock index c987118..0014d89 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -39,23 +39,23 @@ PODS: - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - nanopb (~> 0.3) - - GoogleUtilities/AppDelegateSwizzler (6.2.0): + - GoogleUtilities/AppDelegateSwizzler (6.2.1): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.2.0) - - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment (6.2.1) + - GoogleUtilities/Logger (6.2.1): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.2.0): + - GoogleUtilities/MethodSwizzler (6.2.1): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Network (6.2.1): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.2.0)" - - GoogleUtilities/Reachability (6.2.0): + - "GoogleUtilities/NSData+zlib (6.2.1)" + - GoogleUtilities/Reachability (6.2.1): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/UserDefaults (6.2.1): - GoogleUtilities/Logger - nanopb (0.3.901): - nanopb/decode (= 0.3.901) @@ -89,7 +89,7 @@ SPEC CHECKSUMS: FirebaseInstanceID: f20243a1d828e0e9a3798b995174dedc16f1b32a FirebaseMessaging: 0ac5310133e6ada4cdd44d42e92038855214a5e9 GoogleAppMeasurement: a35a645835bae31b6bdc0576396bc23908f12a22 - GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GoogleUtilities: c7a0b08bda3bf808be823ed151f0e28ac6866e71 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 diff --git a/blista/Base.lproj/Main.storyboard b/blista/Base.lproj/Main.storyboard index bcace54..73eb2f1 100644 --- a/blista/Base.lproj/Main.storyboard +++ b/blista/Base.lproj/Main.storyboard @@ -1072,7 +1072,7 @@ - +