diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b18b05..cc5e180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ +## 4.6.1 + +**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version. + +#### Changed +- Updated to [Braze iOS SDK 4.5.4+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#454). + ## 4.6.0 +**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version. + #### Breaking - Updated to [Braze iOS SDK 4.5.1+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#451). diff --git a/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/CocoaPodsTVOSExample/Segment-Appboy_Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CocoaPodsTVOSExample/Segment-Appboy_Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/CocoaPodsTVOSExample/Segment-Appboy_Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/CocoapodsExample/Segment-Appboy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CocoapodsExample/Segment-Appboy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/CocoapodsExample/Segment-Appboy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/Package.swift b/Package.swift index 854c2af..740db69 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( ], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.1"), - .package(name: "Appboy_iOS_SDK", url: "https://github.com/braze-inc/braze-ios-sdk.git", from: "4.5.1"), + .package(name: "Appboy_iOS_SDK", url: "https://github.com/braze-inc/braze-ios-sdk.git", from: "4.5.4"), ], targets: [ .target( diff --git a/Segment-Appboy.podspec b/Segment-Appboy.podspec index c679c41..a09eed4 100644 --- a/Segment-Appboy.podspec +++ b/Segment-Appboy.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Appboy" - s.version = "4.6.0" + s.version = "4.6.1" s.summary = "Braze Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.subspec 'Full-SDK' do |default| default.platform = :ios - default.dependency 'Appboy-iOS-SDK', '~>4.5.1' + default.dependency 'Appboy-iOS-SDK', '~>4.5.4' default.source_files = 'Pod/Classes/**/*' end @@ -34,22 +34,22 @@ Pod::Spec.new do |s| end s.subspec 'Core' do |core| - core.dependency 'Appboy-iOS-SDK/Core', '~>4.5.1' + core.dependency 'Appboy-iOS-SDK/Core', '~>4.5.4' core.source_files = 'Pod/Classes/**/*' end s.subspec 'InAppMessage' do |iam| - iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>4.5.1' + iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>4.5.4' iam.source_files = 'Pod/Classes/**/*' end s.subspec 'NewsFeed' do |nf| - nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>4.5.1' + nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>4.5.4' nf.source_files = 'Pod/Classes/**/*' end s.subspec 'ContentCards' do |cc| - cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>4.5.1' + cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>4.5.4' cc.source_files = 'Pod/Classes/**/*' end diff --git a/Segment_Appboy.json b/Segment_Appboy.json index a395357..fa7e3bf 100644 --- a/Segment_Appboy.json +++ b/Segment_Appboy.json @@ -1 +1 @@ -{ "4.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.6.0/Segment_Appboy.framework.zip", "4.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.5.0/Segment_Appboy.framework.zip", "4.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.4.0/Segment_Appboy.framework.zip", "4.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.3.0/Segment_Appboy.framework.zip", "4.2.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.2.0/Segment_Appboy.framework.zip", "4.0.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.0.0/Segment_Appboy.framework.zip", "3.6.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.1/Segment_Appboy.framework.zip", "3.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.0/Segment_Appboy.framework.zip", "3.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.5.0/Segment_Appboy.framework.zip", "3.4.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.1/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"} +{ "4.6.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.6.1/Segment_Appboy.framework.zip", "4.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.6.0/Segment_Appboy.framework.zip", "4.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.5.0/Segment_Appboy.framework.zip", "4.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.4.0/Segment_Appboy.framework.zip", "4.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.3.0/Segment_Appboy.framework.zip", "4.2.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.2.0/Segment_Appboy.framework.zip", "4.0.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.0.0/Segment_Appboy.framework.zip", "3.6.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.1/Segment_Appboy.framework.zip", "3.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.0/Segment_Appboy.framework.zip", "3.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.5.0/Segment_Appboy.framework.zip", "3.4.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.1/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 index 1b390f8..762b4c1 100755 --- a/carthage-build.sh +++ b/carthage-build.sh @@ -12,21 +12,15 @@ 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 +# - Updated for Xcode 13 with https://github.com/Carthage/Carthage/issues/3201#issuecomment-859516176 + +CURRENT_XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | cut -d' ' -f2 | cut -d'.' -f1)00" +CURRENT_XCODE_BUILD=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3) -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__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_${CURRENT_XCODE_VERSION}__BUILD_${CURRENT_XCODE_BUILD} = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig + +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__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 "$@" +carthage "$@"