diff --git a/DemoApp/ios/DemoApp.xcodeproj/project.pbxproj b/DemoApp/ios/DemoApp.xcodeproj/project.pbxproj index afd6510b1..9ca6575cd 100644 --- a/DemoApp/ios/DemoApp.xcodeproj/project.pbxproj +++ b/DemoApp/ios/DemoApp.xcodeproj/project.pbxproj @@ -941,13 +941,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-DemoApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 4EBAFDA2A74CA812DABBCDC7 /* [CP] Copy Pods Resources */ = { diff --git a/DemoApp/ios/Podfile b/DemoApp/ios/Podfile index 6c8848bef..6c978923b 100644 --- a/DemoApp/ios/Podfile +++ b/DemoApp/ios/Podfile @@ -8,9 +8,9 @@ target 'DemoApp' do # use_frameworks! # Pods for DemoApp - pod 'MobileCenter/Push', '~> 0.11.0' - pod 'MobileCenter/Crashes', '~> 0.11.0' - pod 'MobileCenter/Analytics', '~> 0.11.0' - pod 'RNMobileCenterShared', '~> 0.8.0' + pod 'MobileCenter/Push', '~> 0.11.2' + pod 'MobileCenter/Crashes', '~> 0.11.2' + pod 'MobileCenter/Analytics', '~> 0.11.2' + pod 'RNMobileCenterShared', '~> 0.8.1' end diff --git a/DemoApp/ios/Podfile.lock b/DemoApp/ios/Podfile.lock index 87124f1b4..bc6a7855b 100644 --- a/DemoApp/ios/Podfile.lock +++ b/DemoApp/ios/Podfile.lock @@ -1,24 +1,24 @@ PODS: - - MobileCenter/Analytics (0.11.0): + - MobileCenter/Analytics (0.11.2): - MobileCenter/Core - - MobileCenter/Core (0.11.0) - - MobileCenter/Crashes (0.11.0): + - MobileCenter/Core (0.11.2) + - MobileCenter/Crashes (0.11.2): - MobileCenter/Core - - MobileCenter/Push (0.11.0): + - MobileCenter/Push (0.11.2): - MobileCenter/Core - - RNMobileCenterShared (0.8.0): - - MobileCenter/Core (~> 0.11.0) + - RNMobileCenterShared (0.8.1): + - MobileCenter/Core (~> 0.11.2) DEPENDENCIES: - - MobileCenter/Analytics (~> 0.11.0) - - MobileCenter/Crashes (~> 0.11.0) - - MobileCenter/Push (~> 0.11.0) - - RNMobileCenterShared (~> 0.8.0) + - MobileCenter/Analytics (~> 0.11.2) + - MobileCenter/Crashes (~> 0.11.2) + - MobileCenter/Push (~> 0.11.2) + - RNMobileCenterShared (~> 0.8.1) SPEC CHECKSUMS: - MobileCenter: 918ffeab6f98aa0d9b617906d406f59e6bdbcbe2 - RNMobileCenterShared: 924e41312401f2eb1007c7a8483f72f61e355a73 + MobileCenter: c08c239253ce523eb18f38958f68ea429ceafc08 + RNMobileCenterShared: 111278ba8775b9497d802a7e6787eee83a9d72df -PODFILE CHECKSUM: a97f5927ef3e2ea1dd3d1d8395f4955aadf26ee2 +PODFILE CHECKSUM: b825475c99377b26aeb91703991b779fc2684f7d -COCOAPODS: 1.2.1 +COCOAPODS: 1.3.0 diff --git a/DemoApp/ios/Pods/Manifest.lock b/DemoApp/ios/Pods/Manifest.lock index 87124f1b4..bc6a7855b 100644 --- a/DemoApp/ios/Pods/Manifest.lock +++ b/DemoApp/ios/Pods/Manifest.lock @@ -1,24 +1,24 @@ PODS: - - MobileCenter/Analytics (0.11.0): + - MobileCenter/Analytics (0.11.2): - MobileCenter/Core - - MobileCenter/Core (0.11.0) - - MobileCenter/Crashes (0.11.0): + - MobileCenter/Core (0.11.2) + - MobileCenter/Crashes (0.11.2): - MobileCenter/Core - - MobileCenter/Push (0.11.0): + - MobileCenter/Push (0.11.2): - MobileCenter/Core - - RNMobileCenterShared (0.8.0): - - MobileCenter/Core (~> 0.11.0) + - RNMobileCenterShared (0.8.1): + - MobileCenter/Core (~> 0.11.2) DEPENDENCIES: - - MobileCenter/Analytics (~> 0.11.0) - - MobileCenter/Crashes (~> 0.11.0) - - MobileCenter/Push (~> 0.11.0) - - RNMobileCenterShared (~> 0.8.0) + - MobileCenter/Analytics (~> 0.11.2) + - MobileCenter/Crashes (~> 0.11.2) + - MobileCenter/Push (~> 0.11.2) + - RNMobileCenterShared (~> 0.8.1) SPEC CHECKSUMS: - MobileCenter: 918ffeab6f98aa0d9b617906d406f59e6bdbcbe2 - RNMobileCenterShared: 924e41312401f2eb1007c7a8483f72f61e355a73 + MobileCenter: c08c239253ce523eb18f38958f68ea429ceafc08 + RNMobileCenterShared: 111278ba8775b9497d802a7e6787eee83a9d72df -PODFILE CHECKSUM: a97f5927ef3e2ea1dd3d1d8395f4955aadf26ee2 +PODFILE CHECKSUM: b825475c99377b26aeb91703991b779fc2684f7d -COCOAPODS: 1.2.1 +COCOAPODS: 1.3.0 diff --git a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenter.framework/MobileCenter b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenter.framework/MobileCenter index 50cb93734..806add6de 100644 Binary files a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenter.framework/MobileCenter and b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenter.framework/MobileCenter differ diff --git a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterAnalytics.framework/MobileCenterAnalytics b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterAnalytics.framework/MobileCenterAnalytics index 72e050aa2..a7304e258 100644 Binary files a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterAnalytics.framework/MobileCenterAnalytics and b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterAnalytics.framework/MobileCenterAnalytics differ diff --git a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterCrashes.framework/MobileCenterCrashes b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterCrashes.framework/MobileCenterCrashes index 6db92774e..78cdab8f5 100644 Binary files a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterCrashes.framework/MobileCenterCrashes and b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterCrashes.framework/MobileCenterCrashes differ diff --git a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterPush.framework/MobileCenterPush b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterPush.framework/MobileCenterPush index 3e7072de1..1d933c005 100644 Binary files a/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterPush.framework/MobileCenterPush and b/DemoApp/ios/Pods/MobileCenter/MobileCenter-SDK-iOS/MobileCenterPush.framework/MobileCenterPush differ diff --git a/DemoApp/ios/Pods/Pods.xcodeproj/project.pbxproj b/DemoApp/ios/Pods/Pods.xcodeproj/project.pbxproj index 3b654fbba..8f8311e80 100644 --- a/DemoApp/ios/Pods/Pods.xcodeproj/project.pbxproj +++ b/DemoApp/ios/Pods/Pods.xcodeproj/project.pbxproj @@ -258,6 +258,55 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + 1C7D17A37D091C98D2F0DD886C3A9320 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Debug; + }; 34FE9531DA9AF2820790339988D5FF41 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -348,61 +397,13 @@ }; name = Release; }; - C104F7F091290C3D1E248192F07FE689 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - C104F7F091290C3D1E248192F07FE689 /* Debug */, + 1C7D17A37D091C98D2F0DD886C3A9320 /* Debug */, 34FE9531DA9AF2820790339988D5FF41 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/DemoApp/ios/Pods/RNMobileCenterShared/RNMobileCenterShared/RNMobileCenterShared.framework/RNMobileCenterShared b/DemoApp/ios/Pods/RNMobileCenterShared/RNMobileCenterShared/RNMobileCenterShared.framework/RNMobileCenterShared index d4c104ba3..08bb8693e 100644 Binary files a/DemoApp/ios/Pods/RNMobileCenterShared/RNMobileCenterShared/RNMobileCenterShared.framework/RNMobileCenterShared and b/DemoApp/ios/Pods/RNMobileCenterShared/RNMobileCenterShared/RNMobileCenterShared.framework/RNMobileCenterShared differ diff --git a/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh b/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh index 0f29f13c2..88dd53799 100755 --- a/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh +++ b/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-frameworks.sh @@ -6,6 +6,10 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -23,9 +27,9 @@ install_framework() source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,6 +58,15 @@ install_framework() fi } +# Copies the dSYM of a vendored framework +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then @@ -76,7 +89,7 @@ strip_invalid_archs() { archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" stripped="" for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" diff --git a/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-resources.sh b/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-resources.sh index aed060f04..1cf16cdcc 100755 --- a/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-resources.sh +++ b/DemoApp/ios/Pods/Target Support Files/Pods-DemoApp/Pods-DemoApp-resources.sh @@ -8,6 +8,10 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt XCASSET_FILES=() +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + case "${TARGETED_DEVICE_FAMILY}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" @@ -44,29 +48,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -74,17 +78,17 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync --delete -avr --copy-links --no-relative "${RSYNC_PROTECT_TMP_FILES[@]}" --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" - rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + rsync --delete -avr --copy-links --no-relative "${RSYNC_PROTECT_TMP_FILES[@]}" --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi rm -f "$RESOURCES_TO_COPY" diff --git a/DemoApp/package.json b/DemoApp/package.json index 1dd887f73..4831bac3b 100644 --- a/DemoApp/package.json +++ b/DemoApp/package.json @@ -7,10 +7,10 @@ "test": "jest" }, "dependencies": { - "mobile-center": "^0.8.0", - "mobile-center-analytics": "^0.8.0", - "mobile-center-crashes": "^0.8.0", - "mobile-center-push": "^0.8.0", + "mobile-center": "^0.8.1", + "mobile-center-analytics": "^0.8.1", + "mobile-center-crashes": "^0.8.1", + "mobile-center-push": "^0.8.1", "react": "15.4.2", "react-native": "0.40.0", "react-navigation": "^1.0.0-beta.11"