From ece0826d33dbbf9a8bc1c735cc3dc5722a98607e Mon Sep 17 00:00:00 2001 From: Louis Bur Date: Thu, 12 Nov 2020 14:37:50 -0500 Subject: [PATCH] Updating Braze SDK --- Appboy-iOS-SDK.podspec | 13 +++---------- AppboyKit/Appboy.bundle/Info.plist | Bin 674 -> 675 bytes AppboyKit/headers/AppboyKitLibrary/Appboy.h | 2 +- CHANGELOG.md | 8 ++++++++ Example/Stopwatch.xcodeproj/project.pbxproj | 13 ++++++------- Example/Stopwatch/Supporting Files/Info.plist | 2 +- Package.swift | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Appboy-iOS-SDK.podspec b/Appboy-iOS-SDK.podspec index e6722968b..5ba9e5173 100644 --- a/Appboy-iOS-SDK.podspec +++ b/Appboy-iOS-SDK.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Appboy-iOS-SDK" - s.version = "3.30.0" + s.version = "4.0.0-beta1" s.summary = "This is the Braze iOS SDK for Mobile Marketing Automation" s.homepage = "http://www.braze.com" s.license = { :type => 'Commercial', :text => 'Please refer to https://github.com/Appboy/appboy-ios-sdk/blob/master/LICENSE'} @@ -14,21 +14,14 @@ Pod::Spec.new do |s| s.preserve_paths = 'AppboyKit/**/*.*' s.default_subspec = 'UI' - s.pod_target_xcconfig = { - 'OTHER_LDFLAGS' => '-ObjC', - - # Skip this architecture to pass Pod validation since we removed the `arm64` simulator ARCH in order to use lipo later - 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' - } - # Same reason as above - s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' } s.subspec 'Core' do |sc| sc.ios.library = 'z' sc.frameworks = 'SystemConfiguration', 'QuartzCore', 'CoreText', 'WebKit' sc.source_files = 'AppboyKit/headers/AppboyKitLibrary/*.h', 'AppboyKit/ABKModalWebViewController.m', 'AppboyKit/ABKNoConnectionLocalization.m', 'AppboyKit/ABKLocationManagerProvider.m' sc.resource = 'AppboyKit/Appboy.bundle' - sc.vendored_libraries = 'AppboyKit/libAppboyKitLibrary.a' + sc.vendored_framework = 'AppboyKit/AppboyKitLibrary.xcframework' sc.weak_framework = 'CoreTelephony', 'Social', 'Accounts', 'AdSupport', 'UserNotifications' end diff --git a/AppboyKit/Appboy.bundle/Info.plist b/AppboyKit/Appboy.bundle/Info.plist index dbcb3c9ca5ec3398df0e51c94ec76561b14c14b8..3e8996fff71848dfda458ba2b47ec5d0b8184923 100644 GIT binary patch delta 88 zcmZ3)x|nstEJn6aLrV`s)5-H0_qi@$T+FzgaW~@u#v_a;8Ba4_VZ6rpn~9l;he?o0 aj!BtGn@OL^kO2&s7$G!+29$ #ifndef APPBOY_SDK_VERSION -#define APPBOY_SDK_VERSION @"3.30.0" +#define APPBOY_SDK_VERSION @"4.0.0-beta1" #endif #if !TARGET_OS_TV diff --git a/CHANGELOG.md b/CHANGELOG.md index c08979124..cb669b97f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 4.0.0-beta1 + +**This beta is not compatible with Carthage.** + +##### Breaking +- `AppboyKit` is now distributed as an XCFramework when integrating with Cocoapods. Cocoapods 1.10.0+ is required. + - This removes the need for integrators to exclude the `arm64` architecture when building for the simulator. Please undo any of the changes that may have been made when upgrading to [3.27.0](#3270). + ## 3.30.0 ##### Breaking diff --git a/Example/Stopwatch.xcodeproj/project.pbxproj b/Example/Stopwatch.xcodeproj/project.pbxproj index 51222cb1c..2863da2cd 100644 --- a/Example/Stopwatch.xcodeproj/project.pbxproj +++ b/Example/Stopwatch.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ 4EB014FD1A79D31D00E11E41 /* InAppMessageTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 955DE8941741A70700C07A57 /* InAppMessageTestViewController.m */; }; 703BF6D4245A2AD9001C1963 /* InAppMessageWithoutAssetZip.html in Resources */ = {isa = PBXBuildFile; fileRef = 703BF6D2245A2AD9001C1963 /* InAppMessageWithoutAssetZip.html */; }; 703BF6D5245A2AD9001C1963 /* InAppMessageWithJS.html in Resources */ = {isa = PBXBuildFile; fileRef = 703BF6D3245A2AD9001C1963 /* InAppMessageWithJS.html */; }; + 70AAB53D2548663C00F64D7C /* StopwatchNotificationContentExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C1C53EFF1F7D7CA600042AA5 /* StopwatchNotificationContentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 715339A6C9F8E86F1CFE61B4 /* libPods-tvOS_Stopwatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7198A927FDBA136DD1BAA0 /* libPods-tvOS_Stopwatch.a */; }; 7435A384D098710E76548E58 /* libPods-StopwatchNotificationContentExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A07EA9383F93EFF70E1F00B /* libPods-StopwatchNotificationContentExtension.a */; }; 7F825DEA205C810100150F07 /* DataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F825DE9205C810100150F07 /* DataViewController.m */; }; @@ -58,7 +59,6 @@ C1C53F011F7D7CA700042AA5 /* UserNotificationsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3688B1A1D6BB2DD0032091D /* UserNotificationsUI.framework */; }; C1C53F051F7D7CA700042AA5 /* NotificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C1C53F041F7D7CA700042AA5 /* NotificationViewController.m */; }; C1C53F081F7D7CA700042AA5 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C1C53F061F7D7CA700042AA5 /* MainInterface.storyboard */; }; - C1C53F0C1F7D7CA700042AA5 /* StopwatchNotificationContentExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C1C53EFF1F7D7CA600042AA5 /* StopwatchNotificationContentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; D400EBF31CC86A6100550AD8 /* EventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D400EBF21CC86A6100550AD8 /* EventsViewController.m */; }; D411F3121CD0355200100702 /* CustomTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = D411F3111CD0355200100702 /* CustomTabBarController.m */; }; D4139BEC1CBDA4F200CA3307 /* FeedUIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4139BEB1CBDA4F200CA3307 /* FeedUIViewController.m */; }; @@ -85,7 +85,7 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - C1C53F0A1F7D7CA700042AA5 /* PBXContainerItemProxy */ = { + 70AAB53E2548663C00F64D7C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 95EF5102173D5FD600C0D780 /* Project object */; proxyType = 1; @@ -119,7 +119,7 @@ dstSubfolderSpec = 13; files = ( E33088211D6BB0B4008935A9 /* StopwatchNotificationService.appex in Embed App Extensions */, - C1C53F0C1F7D7CA700042AA5 /* StopwatchNotificationContentExtension.appex in Embed App Extensions */, + 70AAB53D2548663C00F64D7C /* StopwatchNotificationContentExtension.appex in Embed App Extensions */, ); name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -344,7 +344,6 @@ A77A349C24E6AE46F1B800EA /* Pods-tvOS_TVML_Stopwatch.develop.xcconfig */, 554E827EA66F0EED2E46DF49 /* Pods-tvOS_TVML_Stopwatch.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -752,7 +751,7 @@ ); dependencies = ( E33088201D6BB0B4008935A9 /* PBXTargetDependency */, - C1C53F0B1F7D7CA700042AA5 /* PBXTargetDependency */, + 70AAB53F2548663C00F64D7C /* PBXTargetDependency */, ); name = Stopwatch; productName = Stopwatch; @@ -1437,10 +1436,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C1C53F0B1F7D7CA700042AA5 /* PBXTargetDependency */ = { + 70AAB53F2548663C00F64D7C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = C1C53EFE1F7D7CA600042AA5 /* StopwatchNotificationContentExtension */; - targetProxy = C1C53F0A1F7D7CA700042AA5 /* PBXContainerItemProxy */; + targetProxy = 70AAB53E2548663C00F64D7C /* PBXContainerItemProxy */; }; E33088201D6BB0B4008935A9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; diff --git a/Example/Stopwatch/Supporting Files/Info.plist b/Example/Stopwatch/Supporting Files/Info.plist index 41f9b0740..e2cee696c 100644 --- a/Example/Stopwatch/Supporting Files/Info.plist +++ b/Example/Stopwatch/Supporting Files/Info.plist @@ -24,7 +24,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.30.0 + 4.0.0-beta1 CFBundleSignature ???? CFBundleURLTypes diff --git a/Package.swift b/Package.swift index 8261bda18..1bce21633 100644 --- a/Package.swift +++ b/Package.swift @@ -18,8 +18,8 @@ let package = Package( targets: [ .binaryTarget( name: "AppboyKitLibrary", - url: "https://github.com/Appboy/appboy-ios-sdk/releases/download/3.30.0/AppboyKitLibrary.xcframework.zip", - checksum: "2c7d4234b808537434f8632c824b58e1c53819e364852276f720f28cfac77fab" + url: "https://github.com/Appboy/appboy-ios-sdk/releases/download/4.0.0-beta1/AppboyKitLibrary.xcframework.zip", + checksum: "eed3fc80c235510801c6a3a5ee9e282234297fa1850313ebf07444cdfae04717" ), .target( name: "AppboyKit",