From eecd643493a5a945624b977e6ab35b0f9ca5fa0c Mon Sep 17 00:00:00 2001 From: maureenorea-clores <93700127+maureenorea-clores@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:45:37 +0900 Subject: [PATCH 1/4] doc: update date for v7.5.0 changelog --- inappmessaging/USERGUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inappmessaging/USERGUIDE.md b/inappmessaging/USERGUIDE.md index 5ef29d41..08eb7f06 100644 --- a/inappmessaging/USERGUIDE.md +++ b/inappmessaging/USERGUIDE.md @@ -483,7 +483,7 @@ Documents targeting Product Managers: ## Changelog -### 7.5.0 (In-Progress) +### 7.5.0 (2023-12-12) * SDKCF-6575: Added sending of device Id in all IAM requests. * Improved the following classes to increase code coverage: - InAppMessagingConstants (SDKCF-6497) From cfcb37310579552c735b5ce27df49703b5a9666f Mon Sep 17 00:00:00 2001 From: maureenorea-clores <93700127+maureenorea-clores@users.noreply.github.com> Date: Mon, 11 Dec 2023 17:14:13 +0900 Subject: [PATCH 2/4] build: suppress new sonarqube issues --- .../runtime/data/repositories/AccountRepository.kt | 1 + .../runtime/data/repositories/CampaignRepository.kt | 1 + .../runtime/data/repositories/HostAppInfoRepository.kt | 1 + .../inappmessaging/runtime/view/InAppMessagingTooltipView.kt | 1 + .../runtime/workmanager/schedulers/ConfigScheduler.kt | 1 + .../schedulers/EventMessageReconciliationScheduler.kt | 1 + .../runtime/workmanager/schedulers/MessageMixerPingScheduler.kt | 1 + 7 files changed, 7 insertions(+) diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/AccountRepository.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/AccountRepository.kt index c88b33cf..2bb1dcee 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/AccountRepository.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/AccountRepository.kt @@ -52,6 +52,7 @@ internal abstract class AccountRepository { preferences: PreferencesUtil = PreferencesUtil, ) + @SuppressWarnings("kotlin:S6515") companion object { private const val TOKEN_PREFIX = "OAuth2 " internal const val ID_TRACKING_ERR_MSG = "Both an access token and a user tracking id have been set. " + diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/CampaignRepository.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/CampaignRepository.kt index 537020ed..3c6851e4 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/CampaignRepository.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/CampaignRepository.kt @@ -38,6 +38,7 @@ internal abstract class CampaignRepository { */ abstract fun clearMessages() + @SuppressWarnings("kotlin:S6515") companion object { private var instance: CampaignRepository = CampaignRepositoryImpl() diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/HostAppInfoRepository.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/HostAppInfoRepository.kt index 4622ebf8..9c3db328 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/HostAppInfoRepository.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/data/repositories/HostAppInfoRepository.kt @@ -93,6 +93,7 @@ internal interface HostAppInfoRepository { */ fun getRegisteredActivity(): Activity? + @SuppressWarnings("kotlin:S6515") companion object { private const val TAG = "IAM_HostAppRepository" private var instance: HostAppInfoRepository = HostAppInfoRepositoryImpl() diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/view/InAppMessagingTooltipView.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/view/InAppMessagingTooltipView.kt index 46219665..e3d72ead 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/view/InAppMessagingTooltipView.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/view/InAppMessagingTooltipView.kt @@ -116,6 +116,7 @@ internal class InAppMessagingTooltipView( /** This method binds image to view. */ @Suppress("ClickableViewAccessibility", "TooGenericExceptionCaught", "LongMethod") + @SuppressWarnings("kotlin:S6516") private fun bindImage() { // Display image. this.hide(asGone = true) if (this.imageUrl.isNullOrEmpty()) { diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/ConfigScheduler.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/ConfigScheduler.kt index fa4abc0b..53601fff 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/ConfigScheduler.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/ConfigScheduler.kt @@ -21,6 +21,7 @@ internal interface ConfigScheduler { fun startConfig(delay: Long = 0, workManager: WorkManager? = null) + @SuppressWarnings("kotlin:S6515") companion object { private const val CONFIG_WORKER_NAME = "iam_config_worker" private var instance: ConfigScheduler = ConfigSchedulerImpl() diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/EventMessageReconciliationScheduler.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/EventMessageReconciliationScheduler.kt index 3aa786fb..e8270bd9 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/EventMessageReconciliationScheduler.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/EventMessageReconciliationScheduler.kt @@ -22,6 +22,7 @@ internal interface EventMessageReconciliationScheduler { */ fun startReconciliationWorker(workManager: WorkManager? = null, delay: Long = 0) + @SuppressWarnings("kotlin:S6515") companion object { private const val MESSAGES_EVENTS_WORKER_NAME = "iam_messages_events_worker" private var instance: EventMessageReconciliationScheduler = EventMessageReconciliationSchedulerImpl() diff --git a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/MessageMixerPingScheduler.kt b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/MessageMixerPingScheduler.kt index 18756144..d3191653 100644 --- a/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/MessageMixerPingScheduler.kt +++ b/inappmessaging/src/main/java/com/rakuten/tech/mobile/inappmessaging/runtime/workmanager/schedulers/MessageMixerPingScheduler.kt @@ -27,6 +27,7 @@ internal interface MessageMixerPingScheduler { */ fun pingMessageMixerService(initialDelay: Long, workManager: WorkManager? = null) + @SuppressWarnings("kotlin:S6515") companion object { private const val MESSAGE_MIXER_PING_WORKER = "iam_message_mixer_worker" private var instance: MessageMixerPingScheduler = MessageMixerPingSchedulerImpl() From 6eeda066dbbd0fdc69535ce30670ef241b1507a6 Mon Sep 17 00:00:00 2001 From: maureenorea-clores <93700127+maureenorea-clores@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:53:55 +0900 Subject: [PATCH 3/4] chore: remove `Gemfile.lock` from repo to always use latest gem versions for Danger --- .gitignore | 6 ++++ Gemfile.lock | 96 ---------------------------------------------------- 2 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 8d23afd1..c4f6c839 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,9 @@ fabric.properties *.iml modules.xml *.ipr + +# Gems +.bundle/ +vendor/ +# Use latest gem versions +Gemfile.lock \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index f293e506..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,96 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - claide (1.1.0) - claide-plugins (0.9.2) - cork - nap - open4 (~> 1.3) - colored2 (3.1.2) - cork (0.3.0) - colored2 (~> 3.1) - danger (8.4.2) - claide (~> 1.0) - claide-plugins (>= 0.9.2) - colored2 (~> 3.1) - cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) - faraday-http-cache (~> 2.0) - git (~> 1.7) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0) - no_proxy_fix - octokit (~> 4.7) - terminal-table (>= 1, < 4) - danger-jacoco (0.1.8) - danger-plugin-api (~> 1.0) - nokogiri-happymapper (~> 0.6) - danger-plugin-api (1.0.0) - danger (> 2.0) - faraday (1.9.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-http-cache (2.2.0) - faraday (>= 0.8) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - git (1.11.0) - rchardet (~> 1.8) - kramdown (2.3.1) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - mini_portile2 (2.8.0) - multipart-post (2.1.1) - nap (1.1.0) - no_proxy_fix (0.1.2) - nokogiri (1.13.6) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - nokogiri-happymapper (0.8.1) - nokogiri (~> 1.5) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - open4 (1.3.4) - public_suffix (4.0.6) - racc (1.6.0) - rchardet (1.8.0) - rexml (3.2.5) - ruby2_keywords (0.0.5) - sawyer (0.8.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - danger - danger-jacoco - -BUNDLED WITH - 2.4.1 From ba3946f8e6a444a5f4b81f6c748728670fd44dd7 Mon Sep 17 00:00:00 2001 From: maureenorea-clores <93700127+maureenorea-clores@users.noreply.github.com> Date: Fri, 22 Dec 2023 11:46:44 +0900 Subject: [PATCH 4/4] chore: update dependency check date suppression --- dependency_check_suppressions.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dependency_check_suppressions.xml b/dependency_check_suppressions.xml index 1fca5cf5..320884fa 100755 --- a/dependency_check_suppressions.xml +++ b/dependency_check_suppressions.xml @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ cpe:/a:google:gson CVE-2022-25647 - + @@ -30,21 +30,21 @@ CVE-2022-3171 CVE-2022-3509 - + ^pkg:maven/com\.fasterxml\.woodstox/woodstox\-core@.*$ CVE-2022-40152 - + ^pkg:maven/com\.sun\.xml\.bind\.jaxb/isorelax@.*$ CVE-2023-34411 - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -81,7 +81,7 @@ cpe:/a:squareup:okhttp3 CVE-2021-0341 - + @@ -90,7 +90,7 @@ - +