Version 6.6.0

jagainu · Aug 15, 2023 · 80d2755 · 80d2755
1 parent 69ae5c9
commit 80d2755
Show file tree

Hide file tree

Showing 19 changed files with 109 additions and 51 deletions.
diff --git a/BrazeKit.podspec b/BrazeKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeKit'
-  s.version           = '6.5.0'
+  s.version           = '6.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/6.5.0/BrazeKit.zip',
-    :sha256 => '0e3843a67a1a415f867cc01fa81d698dc72b740f4fc72a5fe37562f376379c3e'
+    :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeKit.zip',
+    :sha256 => '6f5dde7eb911a8a5f15030cb8d8596e700b3b12ce30166428ef976a06835a52a'
   }
 
   s.swift_version           = '5.0'

diff --git a/BrazeKitCompat.podspec b/BrazeKitCompat.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeKitCompat'
-  s.version           = '6.5.0'
+  s.version           = '6.6.0'
   s.summary           = 'Compatibility library for users migrating from AppboyKit.'
 
   s.homepage          = 'https://braze.com'
   s.documentation_url = 'https://braze-inc.github.io/braze-swift-sdk/documentation/brazekitcompat/'
   s.license           = { :type => 'Commercial' }
   s.authors           = 'Braze, Inc.'
 
-  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.5.0' }
+  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.6.0' }
 
   s.swift_version           = '5.0'
   s.ios.deployment_target   = '11.0'
@@ -18,8 +18,8 @@ Pod::Spec.new do |s|
   s.source_files            = 'Sources/BrazeKitCompat/**/*.{h,m}'
   s.public_header_files     = 'Sources/BrazeKitCompat/include/*.h'
 
-  s.dependency 'BrazeKit', '6.5.0'
-  s.dependency 'BrazeLocation', '6.5.0'
+  s.dependency 'BrazeKit', '6.6.0'
+  s.dependency 'BrazeLocation', '6.6.0'
 
   s.pod_target_xcconfig     = { 'DEFINES_MODULE' => 'YES' }
 end
diff --git a/BrazeLocation.podspec b/BrazeLocation.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeLocation'
-  s.version           = '6.5.0'
+  s.version           = '6.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/6.5.0/BrazeLocation.zip',
-    :sha256 => '178ce59114e9bdc8d161857ec475656e15a2c7a7bd28e7880e27d397cf8c874f'
+    :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeLocation.zip',
+    :sha256 => '668f6011946046eea780f806bae588b020569cccfa1a3ab864e65c79388bf0cb'
   }
 
   s.swift_version           = '5.0'
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
 
   # Depends on BrazeKit because BrazeKit includes the internal _BrazeLocationClient symbols required
   # for linking against BrazeLocation.
-  s.dependency 'BrazeKit', '6.5.0'
+  s.dependency 'BrazeKit', '6.6.0'
 
   s.pod_target_xcconfig     = { 'DEFINES_MODULE' => 'YES' }
 end
diff --git a/BrazeNotificationService.podspec b/BrazeNotificationService.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeNotificationService'
-  s.version           = '6.5.0'
+  s.version           = '6.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/6.5.0/BrazeNotificationService.zip',
-    :sha256 => 'faad0dc43447ba9359e87efc18ad0ab066ee1b1acfda39904082eafb85a2bb09'
+    :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeNotificationService.zip',
+    :sha256 => 'd737a5923d4ec72346785209ac4ca892fc91a19a8f5a2b795142e5c156b45799'
   }
 
   s.swift_version           = '5.0'

diff --git a/BrazePushStory.podspec b/BrazePushStory.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazePushStory'
-  s.version           = '6.5.0'
+  s.version           = '6.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/6.5.0/BrazePushStory.zip',
-    :sha256 => '666ad56ebfeac39ff35a7f3595061e0e192364dff5834b461accd4161ad8a54e'
+    :http => 'https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazePushStory.zip',
+    :sha256 => 'd653e639f679e7ab9377eed3564149aa20b4957768f19207b9617ee58997e6c4'
   }
 
   s.swift_version           = '5.0'

diff --git a/BrazeUI.podspec b/BrazeUI.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeUI'
-  s.version           = '6.5.0'
+  s.version           = '6.6.0'
   s.summary           = 'Braze-provided user interface library for In-App Messages and Content Cards.'
 
   s.homepage          = 'https://braze.com'
   s.documentation_url = 'https://braze-inc.github.io/braze-swift-sdk/documentation/brazeui/'
   s.license           = { :type => 'Commercial' }
   s.authors           = 'Braze, Inc.'
 
-  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.5.0' }
+  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.6.0' }
 
   s.swift_version           = '5.0'
   s.ios.deployment_target   = '11.0'
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files            = 'Sources/BrazeUI/**/*.swift'
   s.resource_bundles        = { 'BrazeUI' => ['Sources/BrazeUI/Resources/**/*'] }
 
-  s.dependency 'BrazeKit', '6.5.0'
+  s.dependency 'BrazeKit', '6.6.0'
 
   s.pod_target_xcconfig     = { 'DEFINES_MODULE' => 'YES' }
 end
diff --git a/BrazeUICompat.podspec b/BrazeUICompat.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name              = 'BrazeUICompat'
-  s.version           = '6.5.0'
+  s.version           = '6.6.0'
   s.summary           = 'Compatibility UI library for users migrating from AppboyUI.'
 
   s.homepage          = 'https://braze.com'
   s.documentation_url = 'https://braze-inc.github.io/braze-swift-sdk/documentation/brazeui/'
   s.license           = { :type => 'Commercial' }
   s.authors           = 'Braze, Inc.'
 
-  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.5.0' }
+  s.source            = { :git => 'https://github.com/braze-inc/braze-swift-sdk.git', :tag => '6.6.0' }
 
   s.swift_version           = '5.0'
   s.ios.deployment_target   = '11.0'
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.public_header_files     = 'Sources/BrazeUICompat/ABK*/**/*.h'
   s.resource_bundles        = { 'BrazeUICompat' => 'Sources/BrazeUICompat/*/Resources/**/*.*' }
 
-  s.dependency 'BrazeKitCompat', '6.5.0'
+  s.dependency 'BrazeKitCompat', '6.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
@@ -1,3 +1,14 @@
+## 6.6.0
+
+##### Fixed
+- Fixes an issue in HTML in-app messages where custom event and purchase properties would always convert values for `1` and `0` to become `true` and `false`, respectively.
+  - These property values will now respect their original form in the HTML.
+- Prevents the default Braze UI from displaying in-app messages underneath the keyboard when Stage Manager is in use.
+
+##### Added
+- Adds the [`Braze.FeatureFlags.logFeatureFlagImpression(id: String)`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/featureflags-swift.class/logfeatureflagimpression(id:)) method.
+- Adds the optional `merge` parameter to the Objective-C representation of the [`setCustomAttribute(key:dictionary:merge:)`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/user-swift.class/setcustomattribute(key:dictionary:merge:fileid:line:)) method.
+
 ## 6.5.0
 
 ##### Fixed
@@ -17,7 +28,7 @@
     - [`Braze.Configuration.Push.automation`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/configuration-swift.class/push-swift.class/automation-swift.property) property.
     - [`Braze.Configuration.Push.Automation`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/configuration-swift.class/push-swift.class/automation-swift.class) type (provides details about the behavior of each automation step).
 - Adds the [`Braze.Configuration.forwardUniversalLinks`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/configuration-swift.class/forwarduniversallinks) configuration. When enabled, the SDK will redirect universal links from Braze campaigns to the appropriate system methods.
-- Adds the [`Braze.Notifications.subscribeToUpdates(_:)`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/notifications-swift.class/subscribetoupdates(_:)) method to subscribe to the push notifications handled by the SDK. 
+- Adds the [`Braze.Notifications.subscribeToUpdates(_:)`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/notifications-swift.class/subscribetoupdates(_:)) method to subscribe to the push notifications handled by the SDK.
   - This method runs the provided closure with a [`Braze.Notifications.Payload`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/notifications-swift.class/payload) class representing the processed push notification.
 - Adds the [`Braze.Notifications.deviceToken`](https://braze-inc.github.io/braze-swift-sdk/documentation/brazekit/braze/notifications-swift.class/devicetoken) property to access the most recent notification device token received by the SDK.
 

diff --git a/Examples/ObjC/Sources/PushNotifications/Info.plist b/Examples/ObjC/Sources/PushNotifications/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>PushNotifications</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+</dict>
+</plist>
diff --git a/...-Automatic/PushNotifications.entitlements → ...ifications/PushNotifications.entitlements b/...-Automatic/PushNotifications.entitlements → ...ifications/PushNotifications.entitlements
diff --git 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/6.5.0/braze-swift-sdk-prebuilt.zip"
+url="https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/braze-swift-sdk-prebuilt.zip"
 
 echo "→" "Cleaning up"
 rm -rf braze-swift-sdk-prebuilt

diff --git a/Examples/Swift/Sources/PushNotifications-Manual/PushNotifications.entitlements b/Examples/Swift/Sources/PushNotifications-Manual/PushNotifications.entitlements
diff --git a/Examples/Swift/Sources/PushNotifications/Info.plist b/Examples/Swift/Sources/PushNotifications/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>PushNotifications</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+</dict>
+</plist>
diff --git a/...ons-Manual/PushNotifications.entitlements → ...ifications/PushNotifications.entitlements b/...ons-Manual/PushNotifications.entitlements → ...ifications/PushNotifications.entitlements
diff --git 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/6.5.0/braze-swift-sdk-prebuilt.zip"
+url="https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/braze-swift-sdk-prebuilt.zip"
 
 echo "→" "Cleaning up"
 rm -rf braze-swift-sdk-prebuilt

diff --git a/Package.swift b/Package.swift
@@ -47,8 +47,8 @@ let package = Package(
   targets: [
     .binaryTarget(
       name: "BrazeKit",
-      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.5.0/BrazeKit.zip",
-      checksum: "0e3843a67a1a415f867cc01fa81d698dc72b740f4fc72a5fe37562f376379c3e"
+      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeKit.zip",
+      checksum: "6f5dde7eb911a8a5f15030cb8d8596e700b3b12ce30166428ef976a06835a52a"
     ),
     .target(
       name: "BrazeKitResources",
@@ -65,18 +65,18 @@ let package = Package(
     ),
     .binaryTarget(
       name: "BrazeLocation",
-      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.5.0/BrazeLocation.zip",
-      checksum: "178ce59114e9bdc8d161857ec475656e15a2c7a7bd28e7880e27d397cf8c874f"
+      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeLocation.zip",
+      checksum: "668f6011946046eea780f806bae588b020569cccfa1a3ab864e65c79388bf0cb"
     ),
     .binaryTarget(
       name: "BrazeNotificationService",
-      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.5.0/BrazeNotificationService.zip",
-      checksum: "faad0dc43447ba9359e87efc18ad0ab066ee1b1acfda39904082eafb85a2bb09"
+      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazeNotificationService.zip",
+      checksum: "d737a5923d4ec72346785209ac4ca892fc91a19a8f5a2b795142e5c156b45799"
     ),
     .binaryTarget(
       name: "BrazePushStory",
-      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.5.0/BrazePushStory.zip",
-      checksum: "666ad56ebfeac39ff35a7f3595061e0e192364dff5834b461accd4161ad8a54e"
+      url: "https://github.com/braze-inc/braze-swift-sdk/releases/download/6.6.0/BrazePushStory.zip",
+      checksum: "d653e639f679e7ab9377eed3564149aa20b4957768f19207b9617ee58997e6c4"
     ),
     .target(
       name: "BrazeKitCompat",

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 <p align="center">
   <a href="https://github.com/braze-inc/braze-swift-sdk/releases">
-    <img src="https://badgen.net/badge/version/6.5.0/blue" alt="Version: 6.5.0">
+    <img src="https://badgen.net/badge/version/6.6.0/blue" alt="Version: 6.6.0">
   </a>
   <a href="#">
     <img src="https://badgen.net/badge/platforms/iOS%20%7C%20tvOS%20%7C%20Mac%20Catalyst/orange"

diff --git a/Sources/BrazeUI/Dependencies/KeyboardFrameNotifier.swift b/Sources/BrazeUI/Dependencies/KeyboardFrameNotifier.swift
@@ -86,7 +86,6 @@ open class KeyboardFrameNotifier {
 
   @objc
   func didHide(_ notification: Notification) {
-    frame = .zero
     subscriptions.values.forEach { $0(frame) }
   }
 

diff --git a/Sources/BrazeUI/InAppMessageUI/Views/InAppMessageUIContainerView.swift b/Sources/BrazeUI/InAppMessageUI/Views/InAppMessageUIContainerView.swift
@@ -61,10 +61,10 @@ extension BrazeInAppMessageUI {
       else {
         return
       }
-
-      let frame = window.convert(keyboard.frame, to: superview)
-        .intersection(superview.frame)
+      let frameEnd = window.screen.coordinateSpace.convert(keyboard.frame, to: superview)
+      let frame = superview.bounds.intersection(frameEnd)
       bottomConstraint?.constant = -frame.height
+
       UIView.animate(
         withDuration: 0.25,
         delay: 0,