diff --git a/BrazeKit.podspec b/BrazeKit.podspec index 1c519f2298..60d6ba10c8 100644 --- a/BrazeKit.podspec +++ b/BrazeKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeKit' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Braze Main SDK library providing support for analytics and push notifications.' s.homepage = 'https://braze.com' @@ -9,8 +9,8 @@ Pod::Spec.new do |s| s.authors = 'Braze, Inc.' s.source = { - :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeKit.zip', - :sha256 => 'd7a35e105c76c064091431a175e600ecc145117f51c5cb1707f567698795dfb1' + :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeKit.zip', + :sha256 => '21d77f95fdcffe5bc614bd65d4bd99afd6a7429f40d26401a61e47dc3aad0c32' } s.swift_version = '5.0' diff --git a/BrazeKitCompat.podspec b/BrazeKitCompat.podspec index 447a6d5dcf..a0bbc57d0a 100644 --- a/BrazeKitCompat.podspec +++ b/BrazeKitCompat.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeKitCompat' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Compatibility library for users migrating from AppboyKit.' s.homepage = 'https://braze.com' @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.license = { :type => 'Commercial' } s.authors = 'Braze, Inc.' - s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.5.0' } + s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.6.0' } s.swift_version = '5.0' s.ios.deployment_target = '11.0' @@ -18,8 +18,8 @@ Pod::Spec.new do |s| s.public_header_files = 'Sources/BrazeKitCompat/include/*.h' s.static_framework = true - s.dependency 'BrazeKit', '7.5.0' - s.dependency 'BrazeLocation', '7.5.0' + s.dependency 'BrazeKit', '7.6.0' + s.dependency 'BrazeLocation', '7.6.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } end diff --git a/BrazeLocation.podspec b/BrazeLocation.podspec index 32af31e1e3..c90e76c41d 100644 --- a/BrazeLocation.podspec +++ b/BrazeLocation.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeLocation' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Braze location library providing support for location analytics and geofence monitoring.' s.homepage = 'https://braze.com' @@ -9,8 +9,8 @@ Pod::Spec.new do |s| s.authors = 'Braze, Inc.' s.source = { - :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeLocation.zip', - :sha256 => 'c58ddd61f71ec35eca941aea6a61a4315f68e937c86d8b7342a3bb9041d95c12' + :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeLocation.zip', + :sha256 => '32eb6d7c2ca426ec4f62ad41c6d3db4dfce0d6eab4c87e4336bb18270e73d1e8' } s.swift_version = '5.0' @@ -22,7 +22,7 @@ Pod::Spec.new do |s| # Depends on BrazeKit because BrazeKit includes the internal _BrazeLocationClient symbols required # for linking against BrazeLocation. - s.dependency 'BrazeKit', '7.5.0' + s.dependency 'BrazeKit', '7.6.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } end diff --git a/BrazeNotificationService.podspec b/BrazeNotificationService.podspec index e60f0c130f..53d2a41766 100644 --- a/BrazeNotificationService.podspec +++ b/BrazeNotificationService.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeNotificationService' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Braze notification service extension library providing support for Rich Push notifications.' s.homepage = 'https://braze.com' @@ -9,8 +9,8 @@ Pod::Spec.new do |s| s.authors = 'Braze, Inc.' s.source = { - :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeNotificationService.zip', - :sha256 => 'f1869b6d2391eb696f48c69007836472172701e3fb8183e60fdf556a3d1e415b' + :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeNotificationService.zip', + :sha256 => '74dc30eb807fe9f6a44b50da891e410f71843ff7262c0c242fd17c0e7f9d996e' } s.swift_version = '5.0' diff --git a/BrazePushStory.podspec b/BrazePushStory.podspec index c7c7ff4f4a..b35195e70d 100644 --- a/BrazePushStory.podspec +++ b/BrazePushStory.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazePushStory' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Braze notification content extension library providing support for Push Stories.' s.homepage = 'https://braze.com' @@ -9,8 +9,8 @@ Pod::Spec.new do |s| s.authors = 'Braze, Inc.' s.source = { - :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazePushStory.zip', - :sha256 => '8cd9f1dbac161bf8aabb3d20483db6d3593ba646e297575c2307af3863a5c415' + :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazePushStory.zip', + :sha256 => 'cb413c87cd0f990f936f96f8031e658d53d3ca709d60df6c2209b566e7588645' } s.swift_version = '5.0' diff --git a/BrazeUI.podspec b/BrazeUI.podspec index a0afdf7d08..68de2bf6fe 100644 --- a/BrazeUI.podspec +++ b/BrazeUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeUI' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Braze-provided user interface library for In-App Messages and Content Cards.' s.homepage = 'https://braze.com' @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.license = { :type => 'Commercial' } s.authors = 'Braze, Inc.' - s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.5.0' } + s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.6.0' } s.swift_version = '5.0' s.ios.deployment_target = '11.0' @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.resource_bundles = { 'BrazeUI' => ['Sources/BrazeUI/Resources/**/*'] } s.static_framework = true - s.dependency 'BrazeKit', '7.5.0' + s.dependency 'BrazeKit', '7.6.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } end diff --git a/BrazeUICompat.podspec b/BrazeUICompat.podspec index abfd5229fc..b2b4a5c3cd 100644 --- a/BrazeUICompat.podspec +++ b/BrazeUICompat.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BrazeUICompat' - s.version = '7.5.0' + s.version = '7.6.0' s.summary = 'Compatibility UI library for users migrating from AppboyUI.' s.homepage = 'https://braze.com' @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.license = { :type => 'Commercial' } s.authors = 'Braze, Inc.' - s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.5.0' } + s.source = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '7.6.0' } s.swift_version = '5.0' s.ios.deployment_target = '11.0' @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.resource_bundles = { 'BrazeUICompat' => 'Sources/BrazeUICompat/*/Resources/**/*.*' } s.static_framework = true - s.dependency 'BrazeKitCompat', '7.5.0' + s.dependency 'BrazeKitCompat', '7.6.0' s.dependency 'SDWebImage', '>= 5.8.2', '< 6' s.user_target_xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' } diff --git a/CHANGELOG.md b/CHANGELOG.md index 6763cf2dbb..fcb78bb9fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## 7.6.0 + +##### Added +- Adds the `Braze.InAppMessage.Data.isTestSend` property, which indicates whether an in-app message was triggered as part of a test send. +- Adds logic to separate Braze data into tracking and non-tracking requests. + - Adds the following methods to set and edit the allow list for properties that will be used for tracking: + - `Braze.Configuration.Api.trackingPropertyAllowList`: Set the initial allow list before initializing Braze. + - `Braze.updateTrackingAllowList(adding:removing:)`: Update the existing allow list during runtime. + - For full usage details on these configurations, refer to our tutorial [here](https://braze-inc.github.io/braze-swift-sdk/tutorials/braze/e1-privacy-tracking/). + +##### Fixed +- Adds safeguards to prevent a rare race condition occuring in the SDK network layer. +- Prevents in-app message test sends from attempting re-display after being discarded by a custom in-app message UI delegate. +- Fixes an issue in the default Braze in-app message UI where some messages were not being removed from the stack after display. +- Fixes the compilation of `BrazeKitCompat` and `BrazeUICompat` in Objective-C++ projects. +- Fixes an issue in `BrazeUICompat` where the header text in Full or Modal in-app messages would be duplicated in place of the body text under certain conditions. +- Fixes the encoding of values of types `Float`, `Int8`, `Int16`, `Int32`, `Int64`, `UInt`, `UInt8`, `UInt16`, `UInt32` and `UInt64`. Those types were previously not supported in custom events and purchase properties. +- Fixes an issue preventing purchase events from being logged when the product identifier has a leading dollar sign. +- Fixes an issue preventing custom attributes from being logged when the attribute key has a leading dollar sign. + ## 7.5.0 ##### Added diff --git a/Examples/ObjC/Sources/PushNotifications/Info.plist b/Examples/ObjC/Sources/PushNotifications/Info.plist new file mode 100644 index 0000000000..d7f8ec8ca2 --- /dev/null +++ b/Examples/ObjC/Sources/PushNotifications/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + PushNotifications + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + UIBackgroundModes + + remote-notification + + UILaunchStoryboardName + LaunchScreen + + diff --git a/Examples/ObjC/Sources/PushNotifications/PushNotifications.entitlements b/Examples/ObjC/Sources/PushNotifications/PushNotifications.entitlements new file mode 100644 index 0000000000..9cad402b51 --- /dev/null +++ b/Examples/ObjC/Sources/PushNotifications/PushNotifications.entitlements @@ -0,0 +1,12 @@ + + + + + aps-environment + development + com.apple.security.application-groups + + group.com.braze.PushNotifications.PushStories + + + diff --git a/Examples/ObjC/manual-integration-setup.sh b/Examples/ObjC/manual-integration-setup.sh index 06b4331713..b6bd339f88 100755 --- a/Examples/ObjC/manual-integration-setup.sh +++ b/Examples/ObjC/manual-integration-setup.sh @@ -20,7 +20,7 @@ if [ ! -f "manual-integration-setup.sh" ]; then fi # Constants -url="https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/braze-swift-sdk-prebuilt.zip" +url="https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/braze-swift-sdk-prebuilt.zip" echo "→" "Cleaning up" rm -rf braze-swift-sdk-prebuilt diff --git a/Examples/Swift/Sources/PushNotifications/Info.plist b/Examples/Swift/Sources/PushNotifications/Info.plist new file mode 100644 index 0000000000..d7f8ec8ca2 --- /dev/null +++ b/Examples/Swift/Sources/PushNotifications/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + PushNotifications + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + UIBackgroundModes + + remote-notification + + UILaunchStoryboardName + LaunchScreen + + diff --git a/Examples/Swift/Sources/PushNotifications/PushNotifications.entitlements b/Examples/Swift/Sources/PushNotifications/PushNotifications.entitlements new file mode 100644 index 0000000000..9cad402b51 --- /dev/null +++ b/Examples/Swift/Sources/PushNotifications/PushNotifications.entitlements @@ -0,0 +1,12 @@ + + + + + aps-environment + development + com.apple.security.application-groups + + group.com.braze.PushNotifications.PushStories + + + diff --git a/Examples/Swift/manual-integration-setup.sh b/Examples/Swift/manual-integration-setup.sh index 06b4331713..b6bd339f88 100755 --- a/Examples/Swift/manual-integration-setup.sh +++ b/Examples/Swift/manual-integration-setup.sh @@ -20,7 +20,7 @@ if [ ! -f "manual-integration-setup.sh" ]; then fi # Constants -url="https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/braze-swift-sdk-prebuilt.zip" +url="https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/braze-swift-sdk-prebuilt.zip" echo "→" "Cleaning up" rm -rf braze-swift-sdk-prebuilt diff --git a/Package.swift b/Package.swift index 61d8d3484f..b1afb1f327 100644 --- a/Package.swift +++ b/Package.swift @@ -48,8 +48,8 @@ let package = Package( targets: [ .binaryTarget( name: "BrazeKit", - url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeKit.zip", - checksum: "d7a35e105c76c064091431a175e600ecc145117f51c5cb1707f567698795dfb1" + url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeKit.zip", + checksum: "21d77f95fdcffe5bc614bd65d4bd99afd6a7429f40d26401a61e47dc3aad0c32" ), .target( name: "BrazeKitResources", @@ -66,8 +66,8 @@ let package = Package( ), .binaryTarget( name: "BrazeLocation", - url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeLocation.zip", - checksum: "c58ddd61f71ec35eca941aea6a61a4315f68e937c86d8b7342a3bb9041d95c12" + url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeLocation.zip", + checksum: "32eb6d7c2ca426ec4f62ad41c6d3db4dfce0d6eab4c87e4336bb18270e73d1e8" ), .target( name: "BrazeLocationResources", @@ -77,13 +77,13 @@ let package = Package( ), .binaryTarget( name: "BrazeNotificationService", - url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazeNotificationService.zip", - checksum: "f1869b6d2391eb696f48c69007836472172701e3fb8183e60fdf556a3d1e415b" + url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazeNotificationService.zip", + checksum: "74dc30eb807fe9f6a44b50da891e410f71843ff7262c0c242fd17c0e7f9d996e" ), .binaryTarget( name: "BrazePushStory", - url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.5.0/BrazePushStory.zip", - checksum: "8cd9f1dbac161bf8aabb3d20483db6d3593ba646e297575c2307af3863a5c415" + url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/7.6.0/BrazePushStory.zip", + checksum: "cb413c87cd0f990f936f96f8031e658d53d3ca709d60df6c2209b566e7588645" ), .target( name: "BrazeKitCompat", diff --git a/README.md b/README.md index 742b0f6fed..c4d6bc0f2f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

- Version: 7.5.0 + Version: 7.6.0 #define LogUnimplemented() brzLogUnimplemented(_cmd, [self class]); diff --git a/Sources/BrazeKitCompat/BrazeDelegateWrapper.h b/Sources/BrazeKitCompat/BrazeDelegateWrapper.h index cc9c0f5c3e..e5c83f6e0f 100644 --- a/Sources/BrazeKitCompat/BrazeDelegateWrapper.h +++ b/Sources/BrazeKitCompat/BrazeDelegateWrapper.h @@ -1,5 +1,10 @@ -@import BrazeKit; -@import Foundation; +#import + +#if __has_feature(modules) + @import BrazeKit; +#else + #import +#endif @protocol ABKURLDelegate; @protocol ABKInAppMessageControllerDelegate; diff --git a/Sources/BrazeKitCompat/BrazeSDKAuthDelegateWrapper.h b/Sources/BrazeKitCompat/BrazeSDKAuthDelegateWrapper.h index c3e84ff329..454c02bdbe 100644 --- a/Sources/BrazeKitCompat/BrazeSDKAuthDelegateWrapper.h +++ b/Sources/BrazeKitCompat/BrazeSDKAuthDelegateWrapper.h @@ -1,5 +1,10 @@ -@import BrazeKit; -@import Foundation; +#import + +#if __has_feature(modules) + @import BrazeKit; +#else + #import +#endif @protocol ABKSdkAuthenticationDelegate; diff --git a/Sources/BrazeKitCompat/include/ABKInAppMessageWebViewBridge.h b/Sources/BrazeKitCompat/include/ABKInAppMessageWebViewBridge.h index b109d451c8..807e698be5 100644 --- a/Sources/BrazeKitCompat/include/ABKInAppMessageWebViewBridge.h +++ b/Sources/BrazeKitCompat/include/ABKInAppMessageWebViewBridge.h @@ -1,4 +1,4 @@ -@import Foundation; +#import #if !TARGET_OS_TV diff --git a/Sources/BrazeKitCompat/include/ABKSdkMetadata.h b/Sources/BrazeKitCompat/include/ABKSdkMetadata.h index 09c96f3d8d..59bc8be29d 100644 --- a/Sources/BrazeKitCompat/include/ABKSdkMetadata.h +++ b/Sources/BrazeKitCompat/include/ABKSdkMetadata.h @@ -1,4 +1,4 @@ -@import Foundation; +#import #import "BrazePreprocessor.h" /*! diff --git a/Sources/BrazeKitResources/Resources/PrivacyInfo.xcprivacy b/Sources/BrazeKitResources/Resources/PrivacyInfo.xcprivacy index be24307708..90c3ae63da 100644 --- a/Sources/BrazeKitResources/Resources/PrivacyInfo.xcprivacy +++ b/Sources/BrazeKitResources/Resources/PrivacyInfo.xcprivacy @@ -5,7 +5,18 @@ NSPrivacyTracking NSPrivacyTrackingDomains - + + sdk-tracking.iad-01.braze.com + sdk-tracking.iad-02.braze.com + sdk-tracking.iad-03.braze.com + sdk-tracking.iad-04.braze.com + sdk-tracking.iad-05.braze.com + sdk-tracking.iad-06.braze.com + sdk-tracking.iad-07.braze.com + sdk-tracking.iad-08.braze.com + sdk-tracking.fra-01.braze.eu + sdk-tracking.fra-02.braze.eu + NSPrivacyAccessedAPITypes diff --git a/Sources/BrazeUI/InAppMessageUI/InAppMessageUI.swift b/Sources/BrazeUI/InAppMessageUI/InAppMessageUI.swift index 18fa5c904f..0d72bfb0aa 100644 --- a/Sources/BrazeUI/InAppMessageUI/InAppMessageUI.swift +++ b/Sources/BrazeUI/InAppMessageUI/InAppMessageUI.swift @@ -145,7 +145,7 @@ open class BrazeInAppMessageUI: } // Remove the message from the stack if needed - stack.removeAll { $0 == message } + stack.removeAll { $0.isApproximatelyEqual(to: message) } // Transform remote asset URLs to local asset URLs // - IAMs not originating from Braze (`context == nil`) cannot go through this transformation @@ -316,7 +316,7 @@ open class BrazeInAppMessageUI: logError(for: message.context, error: .otherMessagePresented(push: false)) case .stack: // Remove message from stack (if present) and place on top - stack.removeAll { $0.data.id == message.data.id } + stack.removeAll { $0.isApproximatelyEqual(to: message) } stack.append(message) logError(for: message.context, error: .otherMessagePresented(push: true)) case .followup: @@ -341,7 +341,7 @@ open class BrazeInAppMessageUI: func validateOrientation(for message: Braze.InAppMessage) -> Bool { let traits = Braze.UIUtils.activeTopmostViewController?.traitCollection guard message.orientation.supported(by: traits) else { - stack.removeAll { $0 == message } + stack.removeAll { $0.isApproximatelyEqual(to: message) } logError(for: message.context, error: .noMatchingOrientation) return false } @@ -355,7 +355,7 @@ open class BrazeInAppMessageUI: } guard context.valid else { - stack.removeAll { $0 == message } + stack.removeAll { $0.isApproximatelyEqual(to: message) } logError(for: message.context, error: .messageContextInvalid) return false } diff --git a/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIController.h b/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIController.h index 36e2059993..18c3a3c3f4 100644 --- a/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIController.h +++ b/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIController.h @@ -2,7 +2,17 @@ #import "ABKInAppMessageUIDelegate.h" #import "ABKInAppMessageWindowController.h" -@import BrazeKit; +#if __has_feature(modules) + @import BrazeKit; +#else + #import +#endif + +#if __has_include() + #import +#else + #import "ABKInAppMessageUIControlling.h" +#endif #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" diff --git a/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIDelegate.h b/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIDelegate.h index e731ad20e0..3ab80446a4 100644 --- a/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIDelegate.h +++ b/Sources/BrazeUICompat/ABKInAppMessage/ABKInAppMessageUIDelegate.h @@ -1,7 +1,6 @@ #import #import #import "ABKInAppMessageViewController.h" -@import BrazeKitCompat; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" diff --git a/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.m b/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.m index 4b04544b7e..b9ab4f06cd 100755 --- a/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.m +++ b/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageFullViewController.m @@ -109,7 +109,7 @@ - (void)loadView { [attributedStringHeader addAttribute:NSParagraphStyleAttributeName value:headerStyle range:NSMakeRange(0, ((ABKInAppMessageImmersive *)self.inAppMessage).header.length)]; - self.inAppMessageMessageLabel.attributedText = attributedStringHeader; + self.inAppMessageHeaderLabel.attributedText = attributedStringHeader; } } } diff --git a/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.m b/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.m index 4eb11483a0..106fd30895 100755 --- a/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.m +++ b/Sources/BrazeUICompat/ABKInAppMessage/ViewControllers/ABKInAppMessageModalViewController.m @@ -123,7 +123,7 @@ - (void)loadView { [attributedStringHeader addAttribute:NSParagraphStyleAttributeName value:headerStyle range:NSMakeRange(0, ((ABKInAppMessageImmersive *)self.inAppMessage).header.length)]; - self.inAppMessageMessageLabel.attributedText = attributedStringHeader; + self.inAppMessageHeaderLabel.attributedText = attributedStringHeader; } } } diff --git a/Sources/BrazeUICompat/ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.h b/Sources/BrazeUICompat/ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.h index fdea28f933..31485f45e6 100644 --- a/Sources/BrazeUICompat/ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.h +++ b/Sources/BrazeUICompat/ABKNewsFeed/ViewControllers/ABKNewsFeedTableViewController.h @@ -1,10 +1,14 @@ #import #import "ABKNFBaseCardCell.h" +#if __has_include() + #import +#else + #import "ABKFeedController.h" +#endif #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" -typedef NS_OPTIONS(NSUInteger, ABKCardCategory); @class ABKCard; @interface ABKNewsFeedTableViewController : UITableViewController diff --git a/Sources/BrazeUICompat/ABKUIUtils/ABKSDWebImageImageDelegate.h b/Sources/BrazeUICompat/ABKUIUtils/ABKSDWebImageImageDelegate.h index 682209e810..b45e5d8f1a 100644 --- a/Sources/BrazeUICompat/ABKUIUtils/ABKSDWebImageImageDelegate.h +++ b/Sources/BrazeUICompat/ABKUIUtils/ABKSDWebImageImageDelegate.h @@ -1,4 +1,4 @@ -@import BrazeKitCompat; +#import "ABKImageDelegate.h" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations"