Merge branch 'master' into MOB-7795

Author: hani-iterable

.github/workflows/ios-sdk-release.yml

@@ -42,17 +42,16 @@ jobs:
       - name: Install Cocoapods
         run: gem install cocoapods
 
-      - name: set version number and push podspecs to git
-        run: bundle exec fastlane ios bump_release_version version:$VERSION
-
       - name: clean cocaopods cache and lint
         run: bundle exec fastlane ios clean_and_lint
 
       - name: create xcframeworks and zip
         run: bundle exec fastlane ios build_xcframework output_dir:./output_dir
 
-      - name: create github release and upload assets
+      - name: create and push git tag
+        run: bundle exec fastlane ios create_git_tag version:$VERSION
 
+      - name: create github release and upload assets
         run: |
           bundle exec fastlane ios create_release version:$VERSION branch:$BRANCH changelog_section:$CHANGELOG_SECTION output_dir:$OUTPUT_DIR github_token:$GITHUB_TOKEN set_prerelease:$SET_PRERELEASE
 

CHANGELOG.md

@@ -3,11 +3,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [6.4.17]
+## [6.5.0]
+
+### Added
+
+- Introduces support for embedded messaging: an eligibility–based, personalized messages sent from Iterable to your mobile and web apps, which can display them inline, using native interface components
+- To display embedded messages, you can use customizable, out-of-the-box components provided by the SDK (cards, notifications, banners), or you can build fully custom components of your own design.
+- To learn more, read [Embedded Messages with Iterable's iOS SDK](https://support.iterable.com/hc/articles/23061840746900).
 
 ### Changed
 
-- IterableTaskRunner’s stop function now to set `running` variable as `false`
+- `IterableConfig` is updated with an `enableEmbeddedMessaging` flag that needs to be set to true to allow use of embedded messaging functionality
+
+## [6.4.17]
+
+### Fixed
+
+- Resolved push open tracking issue when the app is running in the background.
 
 ## [6.4.16]
 

Iterable-iOS-AppExtensions.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-AppExtensions"
   s.module_name  = "IterableAppExtensions"
-  s.version      = "6.4.17"
+  s.version      = "6.5.0"
   s.summary      = "App Extensions for Iterable SDK"
 
   s.description  = <<-DESC

Iterable-iOS-SDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-SDK"
   s.module_name  = "IterableSDK"
-  s.version      = "6.4.17"
+  s.version      = "6.5.0"
   s.summary      = "Iterable's official SDK for iOS"
 
   s.description  = <<-DESC

README.md

@@ -37,6 +37,7 @@ To learn more about various SDK features, read:
 - [Customizing Mobile Inbox on iOS](https://support.iterable.com/hc/articles/360039091471)
 - [iOS Universal Links](https://support.iterable.com/hc/articles/360035496511)
 - [Deep Links in Push Notifications](https://support.iterable.com/hc/articles/360035453971)
+- [Embedded Messages with Iterable's iOS SDK](https://support.iterable.com/hc/articles/23061840746900)
 
 ## Sample projects
 

fastlane/Fastfile

@@ -14,6 +14,7 @@ platform :ios do
     bump_release_version(version:set_version)
     clean_and_lint
     build_xcframework(output_dir:set_output_dir)
+    create_git_tag(version:set_version)
     create_release(version:set_version, output_dir:set_output_dir, changelog_section:set_changelog_section, github_token:set_github_token)
     pod_trunk_push
   end 
@@ -77,6 +78,14 @@ platform :ios do
     )
   end
 
+  desc "create git tag and push tag"
+  lane :create_git_tag do |options|
+    version = options[:version]
+
+    add_git_tag(tag: "#{version}")
+    push_git_tags
+  end
+
   desc "create github release and upload assets"
   lane :create_release do |options|
     version = options[:version]
@@ -86,8 +95,6 @@ platform :ios do
     github_token = options[:github_token]
     set_prerelease = options[:set_prerelease]
 
-    add_git_tag(tag: "#{version}") 
-
     version_changelog = read_changelog(
       changelog_path: 'CHANGELOG.md',
       section_identifier: "[#{changelog_section}]",	

sample-apps/swift-sample-app/swift-sample-app.xcodeproj/project.pbxproj

@@ -21,6 +21,9 @@
 		ACA3A15120E2F83E00FEF74F /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACA3A15020E2F83E00FEF74F /* NotificationService.swift */; };
 		ACA3A15520E2F83E00FEF74F /* swift-sample-app-notification-extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = ACA3A14E20E2F83D00FEF74F /* swift-sample-app-notification-extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		ACE7624B20FEB2C20040A002 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACE7624A20FEB2C20040A002 /* LoginViewController.swift */; };
+		E9C60B7B2B3C2061005C4462 /* embeddedmessages.json in Resources */ = {isa = PBXBuildFile; fileRef = E9C60B792B3C2061005C4462 /* embeddedmessages.json */; };
+		E9C60B7C2B3C2061005C4462 /* EmbeddedMessagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C60B7A2B3C2061005C4462 /* EmbeddedMessagesViewController.swift */; };
+		E9C60B7E2B3C2072005C4462 /* IterableCardViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C60B7D2B3C2072005C4462 /* IterableCardViewCell.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -65,6 +68,9 @@
 		ACA3A16420E2FC7500FEF74F /* swift-sample-app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "swift-sample-app.entitlements"; sourceTree = "<group>"; };
 		ACE7624A20FEB2C20040A002 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
 		ACFA148520E3033700AF4A5A /* CoffeeType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoffeeType.swift; sourceTree = "<group>"; };
+		E9C60B792B3C2061005C4462 /* embeddedmessages.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = embeddedmessages.json; sourceTree = "<group>"; };
+		E9C60B7A2B3C2061005C4462 /* EmbeddedMessagesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmbeddedMessagesViewController.swift; sourceTree = "<group>"; };
+		E9C60B7D2B3C2072005C4462 /* IterableCardViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IterableCardViewCell.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -128,6 +134,7 @@
 		ACA3A13720E2F6AF00FEF74F /* swift-sample-app */ = {
 			isa = PBXGroup;
 			children = (
+				E9C60B782B3C2061005C4462 /* EmbeddedMessages */,
 				AC5ECD9D20E303F50081E1DA /* ViewControllers */,
 				AC5ECD9B20E3038B0081E1DA /* Deep Link Handling */,
 				ACFA148620E3034800AF4A5A /* Assets */,
@@ -182,6 +189,16 @@
 			name = Storyboards;
 			sourceTree = "<group>";
 		};
+		E9C60B782B3C2061005C4462 /* EmbeddedMessages */ = {
+			isa = PBXGroup;
+			children = (
+				E9C60B7D2B3C2072005C4462 /* IterableCardViewCell.swift */,
+				E9C60B792B3C2061005C4462 /* embeddedmessages.json */,
+				E9C60B7A2B3C2061005C4462 /* EmbeddedMessagesViewController.swift */,
+			);
+			path = EmbeddedMessages;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -282,6 +299,7 @@
 				ACA3A14320E2F6B100FEF74F /* LaunchScreen.storyboard in Resources */,
 				ACA3A14020E2F6B100FEF74F /* Assets.xcassets in Resources */,
 				ACA3A13E20E2F6AF00FEF74F /* Main.storyboard in Resources */,
+				E9C60B7B2B3C2061005C4462 /* embeddedmessages.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -299,6 +317,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E9C60B7C2B3C2061005C4462 /* EmbeddedMessagesViewController.swift in Sources */,
+				E9C60B7E2B3C2072005C4462 /* IterableCardViewCell.swift in Sources */,
 				AC1BDF5A20E304CC000010CA /* CoffeeViewController.swift in Sources */,
 				ACA3A13920E2F6AF00FEF74F /* AppDelegate.swift in Sources */,
 				AC1BDF5920E304BF000010CA /* DeepLinkHandler.swift in Sources */,