diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eaebf1..b7ab60b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +## 3.4.0 + +##### Breaking +- Updated to [Braze iOS SDK 3.27.0](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#3270). This release adds support for iOS 14 and requires XCode 12. Please read the Braze iOS SDK changelog for details. + ## 3.3.0 + #### Changed - Updated to [Braze iOS SDK 3.26.1](https://github.com/Appboy/appboy-ios-sdk/releases/tag/3.26.1). - Deprecates the compilation macro `ABK_ENABLE_IDFA_COLLECTION` in favor of the `ABKIDFADelegate` implementation. diff --git a/CarthageExample/Cartfile.resolved b/CarthageExample/Cartfile.resolved index 57074d2..79bf8c7 100644 --- a/CarthageExample/Cartfile.resolved +++ b/CarthageExample/Cartfile.resolved @@ -1,3 +1,3 @@ -github "appboy/appboy-ios-sdk" "3.23.0" -github "appboy/appboy-segment-ios" "3.1.0" -github "segmentio/analytics-ios" "3.8.2" +binary "https://raw.githubusercontent.com/Appboy/appboy-segment-ios/master/Segment_Appboy.json" "3.3.0" +github "appboy/appboy-ios-sdk" "3.27.0" +github "segmentio/analytics-ios" "4.0.5" diff --git a/Segment-Appboy.podspec b/Segment-Appboy.podspec index 554bfa0..680ae07 100644 --- a/Segment-Appboy.podspec +++ b/Segment-Appboy.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Appboy" - s.version = "3.3.0" + s.version = "3.4.0" s.summary = "Braze Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -22,27 +22,27 @@ Pod::Spec.new do |s| s.default_subspec = 'Full-SDK' s.subspec 'Full-SDK' do |default| - default.dependency 'Appboy-iOS-SDK', '~>3.26.1' + default.dependency 'Appboy-iOS-SDK', '~>3.27.0' default.source_files = 'Pod/Classes/**/*' end s.subspec 'Core' do |core| - core.dependency 'Appboy-iOS-SDK/Core', '~>3.26.1' + core.dependency 'Appboy-iOS-SDK/Core', '~>3.27.0' core.source_files = 'Pod/Classes/**/*' end s.subspec 'InAppMessage' do |iam| - iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>3.26.1' + iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>3.27.0' iam.source_files = 'Pod/Classes/**/*' end s.subspec 'NewsFeed' do |nf| - nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>3.26.1' + nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>3.27.0' nf.source_files = 'Pod/Classes/**/*' end s.subspec 'ContentCards' do |cc| - cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>3.26.1' + cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>3.27.0' cc.source_files = 'Pod/Classes/**/*' end diff --git a/Segment_Appboy.json b/Segment_Appboy.json index dc6affb..2d36ef8 100644 --- a/Segment_Appboy.json +++ b/Segment_Appboy.json @@ -1 +1 @@ -{ "3.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.3.0/Segment_Appboy.framework.zip", "3.2.0" : "https://github.com/Appboy/appboy-segment-ios/releases/download/3.2.0/Segment_Appboy.framework.zip"} +{ "3.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.0/Segment_Appboy.framework.zip", "3.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.3.0/Segment_Appboy.framework.zip", "3.2.0" : "https://github.com/Appboy/appboy-segment-ios/releases/download/3.2.0/Segment_Appboy.framework.zip"} diff --git a/carthage-build.sh b/carthage-build.sh new file mode 100755 index 0000000..1b390f8 --- /dev/null +++ b/carthage-build.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +# carthage-build.sh +# Usage example: ./carthage-build.sh --platform iOS +# +# Workaround for https://git.io/JUR1M + +set -euo pipefail + +xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) +trap 'rm -f "$xcconfig"' INT TERM HUP EXIT + +# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise +# the build will fail on lipo due to duplicate architectures. +# Xcode 12 Beta 3: +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8169g = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +# Xcode 12 beta 4 +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8179i = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +# Xcode 12 beta 5 +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189h = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +# Xcode 12 beta 6 +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A8189n = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +# Xcode 12 GM (12A7208) +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7208 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +# Xcode 12 GM (12A7209) +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_12A7209 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig + +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig +echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig + +export XCODE_XCCONFIG_FILE="$xcconfig" +carthage build "$@"