aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Paul Beusterien <paulbeusterien@google.com>2018-05-13 19:10:35 -0700
committerGravatar GitHub <noreply@github.com>2018-05-13 19:10:35 -0700
commit97dc3a3f6717ab2932ceb7975367f3f4fe6fbce6 (patch)
tree03a5d617143cb3ed9f1136f8cc7ea0bed269358a /scripts
parent450d7a18ffffbaeb8722b2d84ec181fbff7e91bb (diff)
Update travis to use CocoaPods 1.5.2 (#1103)
* Update travis to use CocoaPods 1.5.2 * CODE_SIGNING_ALLOWED=YES * Remove workaround and iPhone 8 * Remove #1210 static library Podfile workaround * Add -all_load to Firestore Example so all C++ is available for tests
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build.sh7
-rwxr-xr-xscripts/if_changed.sh1
2 files changed, 3 insertions, 5 deletions
diff --git a/scripts/build.sh b/scripts/build.sh
index b024e9f..4d6c230 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -84,7 +84,7 @@ case "$platform" in
iOS)
xcb_flags=(
-sdk 'iphonesimulator'
- -destination 'platform=iOS Simulator,name=iPhone 7'
+ -destination 'platform=iOS Simulator,name=iPhone 8 Plus'
)
;;
@@ -111,6 +111,7 @@ esac
xcb_flags+=(
ONLY_ACTIVE_ARCH=YES
CODE_SIGNING_REQUIRED=NO
+ CODE_SIGNING_ALLOWED=YES
)
# TODO(varconst): --warn-unused-vars - right now, it makes the log overflow on
@@ -179,10 +180,6 @@ case "$product-$method-$platform" in
cd Example
sed -i -e 's/use_frameworks/\#use_frameworks/' Podfile
pod update --no-repo-update
- # Workarounds for https://github.com/CocoaPods/CocoaPods/issues/7592.
- # Remove when updating to CocoaPods 1.5.1
- sed -i -e 's/-l"FirebaseMessaging"//' "Pods/Target Support Files/Pods-Messaging_Tests_iOS/Pods-Messaging_Tests_iOS.debug.xcconfig"
- sed -i -e 's/-l"FirebaseAuth-iOS" -l"FirebaseCore-iOS"//' "Pods/Target Support Files/Pods-Auth_Tests_iOS/Pods-Auth_Tests_iOS.debug.xcconfig"
cd ..
RunXcodebuild \
-workspace 'Example/Firebase.xcworkspace' \
diff --git a/scripts/if_changed.sh b/scripts/if_changed.sh
index 3bc2a65..51217d6 100755
--- a/scripts/if_changed.sh
+++ b/scripts/if_changed.sh
@@ -68,6 +68,7 @@ fi
# Always rebuild if Travis configuration and/or build scripts changed.
check_changes '^.travis.yml'
+check_changes '^Gemfile.lock'
check_changes '^scripts/(build|if_changed).sh'
if [[ "$run" == true ]]; then