From ba32c155e296573fa95c638591f7523beda3b802 Mon Sep 17 00:00:00 2001 From: NewBieChan Date: Fri, 10 May 2024 10:31:11 +0900 Subject: [PATCH 1/7] remove inbox from changelog (#444) --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dad33c..0683a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ | KarteRemoteNotification | プッシュ通知の受信および効果測定機能を提供します。 | 2.11.0 | | KarteVariables | 設定値配信機能を提供します。 | 2.10.0 | | KarteVisualTracking | ビジュアルトラッキング機能を提供します。 | 2.12.0 | -| KarteInbox | Push通知の送信履歴を取得する機能を提供します（β版）。 | 0.1.0 | | KarteCrashReporting | クラッシュイベントのトラッキング機能を提供します。 | 2.7.1 | | KarteUtilities | KarteCore モジュール等が利用するUtility機能を提供します。通常直接参照する必要はありません。 | 3.12.0 | | KarteNotificationServiceExtension | リッチプッシュ通知機能を提供します。 | 1.2.0 | From 5b6a4958272ce92d4ef71d116abbc9052e4f76ff Mon Sep 17 00:00:00 2001 From: NewBieChan Date: Wed, 15 May 2024 11:08:25 +0900 Subject: [PATCH 2/7] remove inbox from doc (#446) Co-authored-by: wasnot --- README.md | 1 - scripts/generate_docs.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d01c21..3eb7c82 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ The API references are located at - [KarteRemoteNotification](https://plaidev.github.io/karte-sdk-docs/ios/latest/KarteRemoteNotification/index.html) - [KarteVariables](https://plaidev.github.io/karte-sdk-docs/ios/latest/KarteVariables/index.html) - [KarteVisualTracking](https://plaidev.github.io/karte-sdk-docs/ios/latest/KarteVisualTracking/index.html) -- [KarteInbox](https://plaidev.github.io/karte-sdk-docs/ios/latest/KarteInbox/index.html) - [KarteCrashReporting](https://plaidev.github.io/karte-sdk-docs/ios/latest/KarteCrashReporting/index.html) ## Getting Help diff --git a/scripts/generate_docs.rb b/scripts/generate_docs.rb index 3b3a5bf..10a6f7a 100755 --- a/scripts/generate_docs.rb +++ b/scripts/generate_docs.rb @@ -213,7 +213,7 @@ def run Fastlane.load_actions - podspecs = ['Core', 'InAppMessaging', 'RemoteNotification', 'Variables', 'VisualTracking', 'Inbox', 'CrashReporting'].map do |name| + podspecs = ['Core', 'InAppMessaging', 'RemoteNotification', 'Variables', 'VisualTracking', 'CrashReporting'].map do |name| File.join("../Karte#{name}.podspec") end podspecs.each do |podspec| From e1c7ee8164d477a58e5ce0c76f63732e4c324ea8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 15:55:37 +0900 Subject: [PATCH 3/7] chore(deps-dev): bump nokogiri from 1.16.3 to 1.16.5 (#445) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.3 to 1.16.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.3...v1.16.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a4fa1b..5bb9e89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM liferaft (0.0.6) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) molinillo (0.8.0) multi_json (1.15.0) @@ -276,7 +276,7 @@ GEM netrc (0.11.0) nkf (0.2.0) no_proxy_fix (0.1.2) - nokogiri (1.16.3) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (8.1.0) From bf8296ca446405782b713b5d0fc5338ab45c5217 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 20:04:29 +0900 Subject: [PATCH 4/7] chore(deps-dev): bump rexml from 3.2.6 to 3.2.8 (#447) --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5bb9e89..421f152 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,8 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -324,6 +325,7 @@ GEM xcodeproj (~> 1.21) sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) From b6c56175131e0ba5e1efe844127f93173b8cb51e Mon Sep 17 00:00:00 2001 From: NewBieChan Date: Mon, 3 Jun 2024 21:07:01 +0900 Subject: [PATCH 5/7] Skip swizzle on view not found (#451) * skip swizzling when views are not found on viewDidAppear * update changelog --- CHANGELOG.md | 7 ++++++- Karte.xcodeproj/project.pbxproj | 4 ++-- KarteInAppMessaging.podspec | 2 +- KarteInAppMessaging/Swizzlers/UIViewControllerProxy.swift | 5 ++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0683a52..7582110 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ | モジュール名 | Description | 最新のバージョン | | :-- | :-- | :-- | | KarteCore | イベントトラッキング機能を提供します。 | 2.27.0 | -| KarteInAppMessaging | アプリ内メッセージ機能を提供します。 | 2.17.0 | +| KarteInAppMessaging | アプリ内メッセージ機能を提供します。 | 2.17.1 | | KarteRemoteNotification | プッシュ通知の受信および効果測定機能を提供します。 | 2.11.0 | | KarteVariables | 設定値配信機能を提供します。 | 2.10.0 | | KarteVisualTracking | ビジュアルトラッキング機能を提供します。 | 2.12.0 | @@ -11,6 +11,11 @@ | KarteUtilities | KarteCore モジュール等が利用するUtility機能を提供します。通常直接参照する必要はありません。 | 3.12.0 | | KarteNotificationServiceExtension | リッチプッシュ通知機能を提供します。 | 1.2.0 | +# Releases - xxxx.xx.xx + +### InAppMessaging 2.27.0 +** 💊FIXED** +- 一部の別ライブラリと併用した場合にcrashする不具合を修正しました。 # Releases - 2024.05.09 ## Version 2.14.0 diff --git a/Karte.xcodeproj/project.pbxproj b/Karte.xcodeproj/project.pbxproj index a5a60bf..1bcba85 100644 --- a/Karte.xcodeproj/project.pbxproj +++ b/Karte.xcodeproj/project.pbxproj @@ -3896,7 +3896,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.17.0; + MARKETING_VERSION = 2.17.1; PRODUCT_BUNDLE_IDENTIFIER = io.karte.KarteInAppMessaging; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3929,7 +3929,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.17.0; + MARKETING_VERSION = 2.17.1; PRODUCT_BUNDLE_IDENTIFIER = io.karte.KarteInAppMessaging; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/KarteInAppMessaging.podspec b/KarteInAppMessaging.podspec index 281d4e7..1899fd0 100644 --- a/KarteInAppMessaging.podspec +++ b/KarteInAppMessaging.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'KarteInAppMessaging' - s.version = '2.17.0' + s.version = '2.17.1' s.summary = 'KARTE In-app messaging SDK' s.homepage = 'https://karte.io' s.author = { 'PLAID' => 'dev.share@plaid.co.jp' } diff --git a/KarteInAppMessaging/Swizzlers/UIViewControllerProxy.swift b/KarteInAppMessaging/Swizzlers/UIViewControllerProxy.swift index e3c97c0..3db93f6 100644 --- a/KarteInAppMessaging/Swizzlers/UIViewControllerProxy.swift +++ b/KarteInAppMessaging/Swizzlers/UIViewControllerProxy.swift @@ -140,7 +140,10 @@ extension UIViewControllerProxy { ) originalFunction(receiver, viewDidAppearSelector, animated) - let window = receiver.view.window + guard let window = receiver.view?.window else { + Logger.warn(tag: .inAppMessaging, message: "The view is nil and the window not found") + return + } let process = InAppMessaging.shared.retrieveProcess(window: window) process?.viewDidAppearFromViewController(receiver) } From 85c73ada57dcb36e1f9374ee43b1c9267560bdaa Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 3 Jun 2024 12:08:01 +0000 Subject: [PATCH 6/7] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7582110..a9441a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ | KarteUtilities | KarteCore モジュール等が利用するUtility機能を提供します。通常直接参照する必要はありません。 | 3.12.0 | | KarteNotificationServiceExtension | リッチプッシュ通知機能を提供します。 | 1.2.0 | -# Releases - xxxx.xx.xx +# Releases - 2024.06.03 +## Version 2.14.0 ### InAppMessaging 2.27.0 ** 💊FIXED** From 36ed9d3111474d732124df5994443e9c3d038539 Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 3 Jun 2024 12:11:57 +0000 Subject: [PATCH 7/7] Update spm manifest file --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index eecccfa..fd8db01 100644 --- a/Package.swift +++ b/Package.swift @@ -57,7 +57,7 @@ let package = Package( name: "KarteCore", url: "https://sdk.karte.io/ios/swiftpm/Core-2.27.0/KarteCore.xcframework.zip", checksum: "4d84780cffc846c46a135e1462e20b1ddd5b533c4aed6816bb9a45989f32eb2e" ), .binaryTarget( - name: "KarteInAppMessaging", url: "https://sdk.karte.io/ios/swiftpm/InAppMessaging-2.17.0/KarteInAppMessaging.xcframework.zip", checksum: "a4c9bf7c72902d69801026bdc47351f21690b8c6168d29b2bc2d3f9babd46dc9" + name: "KarteInAppMessaging", url: "https://sdk.karte.io/ios/swiftpm/InAppMessaging-2.17.1/KarteInAppMessaging.xcframework.zip", checksum: "ece8b3cadb4956b2c8951486bb9e51c20f1a2abef6e3d3ccb8c548f42bcb724e" ), .binaryTarget( name: "KarteVariables", url: "https://sdk.karte.io/ios/swiftpm/Variables-2.10.0/KarteVariables.xcframework.zip", checksum: "19665bf1c9eb5e04719b660839de4ca1145589a62669de6f12efb38fc39a4aad"