From 0c4bcb1c232c448cdc1a1d1dc19fe42276ba8982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 09:14:55 +0000 Subject: [PATCH 1/2] build(deps): Bump the kotlin-ksp group across 1 directory with 11 updates Bumps the kotlin-ksp group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin:kotlin-test-junit](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.kapt](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.plugin.allopen](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.plugin.compose](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.plugin.parcelize](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [org.jetbrains.kotlin.plugin.serialization](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.10` | | [com.google.devtools.ksp:symbol-processing-api](https://github.com/google/ksp) | `2.0.21-1.0.28` | `2.1.10-1.0.31` | | [com.google.devtools.ksp](https://github.com/google/ksp) | `2.0.21-1.0.28` | `2.1.10-1.0.31` | Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.kapt` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.allopen` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.android` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.compose` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.jvm` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `com.google.devtools.ksp:symbol-processing-api` from 2.0.21-1.0.28 to 2.1.10-1.0.31 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.0.21-1.0.28...2.1.10-1.0.31) Updates `com.google.devtools.ksp` from 2.0.21-1.0.28 to 2.1.10-1.0.31 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.0.21-1.0.28...2.1.10-1.0.31) Updates `org.jetbrains.kotlin.kapt` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.allopen` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.android` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.compose` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.jvm` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.0.21 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.10) Updates `com.google.devtools.ksp` from 2.0.21-1.0.28 to 2.1.10-1.0.31 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.0.21-1.0.28...2.1.10-1.0.31) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.kapt dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.allopen dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: com.google.devtools.ksp:symbol-processing-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.kapt dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.allopen dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: kotlin-ksp ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1142530654f9..f68e2ce3a660 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,10 +83,10 @@ json-path = '2.9.0' jsoup = '1.20.1' junit = '4.13.2' kotlin-compile-testing = '1.6.0' -kotlin-main = '2.0.21' +kotlin-main = '2.1.21' kotlinx-coroutines = '1.10.2' kotlinx-kover = '0.7.6' -ksp = '2.0.21-1.0.28' +ksp = '2.1.21-2.0.1' mockito-android = '5.18.0' mockito-kotlin = '4.1.0' mpandroidchart = 'v3.1.0' From 7b3782ed1c2d5b55dac1cd0b5c06c84d5917cfb5 Mon Sep 17 00:00:00 2001 From: adalpari Date: Wed, 28 May 2025 13:21:00 +0200 Subject: [PATCH 2/2] Fixing the warnign that have become errors after the update --- .../org/wordpress/android/ui/debug/DebugSettingsViewModel.kt | 1 - .../java/org/wordpress/android/ui/mysite/MySiteFragment.kt | 4 ++-- .../org/wordpress/android/ui/stats/refresh/StatsFragment.kt | 4 ++-- .../java/org/wordpress/android/fluxc/model/list/ListOrder.kt | 2 +- .../wordpress/android/fluxc/model/list/PostListDescriptor.kt | 2 +- .../android/fluxc/model/notification/NotificationModel.kt | 2 +- .../fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt | 2 +- .../org/wordpress/android/fluxc/store/NotificationStore.kt | 4 ++-- .../main/java/org/wordpress/android/fluxc/store/PageStore.kt | 4 ++-- .../java/org/wordpress/android/fluxc/store/QuickStartStore.kt | 3 ++- .../main/java/org/wordpress/android/fluxc/store/SiteStore.kt | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt index 754d291afd70..395daf3a1573 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt @@ -132,7 +132,6 @@ class DebugSettingsViewModel return when (this) { FeatureFlagConfigDao.FeatureFlagValueSource.BUILD_CONFIG -> "Local value" FeatureFlagConfigDao.FeatureFlagValueSource.REMOTE -> "Remote Value" - else -> null } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt index 7ef9e636cfe2..8010249aafeb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteFragment.kt @@ -212,9 +212,9 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment), } override fun onConfirm(result: Bundle?) { - val task = result?.getSerializableCompat( + val task = result?.getSerializableCompat( QuickStartFullScreenDialogFragment.RESULT_TASK - ) as? QuickStartStore.QuickStartTask + ) task?.let { viewModel.onQuickStartTaskCardClick(it) } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt index f2a173cc2283..5897f133c42f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt @@ -81,9 +81,9 @@ class StatsFragment : Fragment(R.layout.stats_fragment), ScrollableViewInitializ WeakReference? = null override fun setPullToRefreshReceiver( - pullToRefreshEmitterListener: StatsPullToRefreshListener.PullToRefreshEmitterListener + emitterListener: StatsPullToRefreshListener.PullToRefreshEmitterListener ) { - currentStatsPullToRefreshListener = WeakReference(pullToRefreshEmitterListener) + currentStatsPullToRefreshListener = WeakReference(emitterListener) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt index ec8061f6b9c0..77b70276d50d 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListOrder.kt @@ -7,7 +7,7 @@ enum class ListOrder(val value: String) { DESC("DESC"); companion object { fun fromValue(value: String): ListOrder? { - return values().firstOrNull { it.value.toLowerCase(Locale.ROOT) == value.toLowerCase(Locale.ROOT) } + return values().firstOrNull { it.value.lowercase(Locale.ROOT) == value.lowercase(Locale.ROOT) } } } } diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt index 5f8296f62f2a..03ab6dd36f46 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/PostListDescriptor.kt @@ -105,7 +105,7 @@ enum class PostListOrderBy(val value: String) { companion object { fun fromValue(value: String): PostListOrderBy? { - return values().firstOrNull { it.value.toLowerCase(Locale.ROOT) == value.toLowerCase(Locale.ROOT) } + return values().firstOrNull { it.value.lowercase(Locale.ROOT) == value.lowercase(Locale.ROOT) } } } } diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt index 210d9d3bd39d..610c7c8480c5 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/notification/NotificationModel.kt @@ -62,7 +62,7 @@ data class NotificationModel( return if (type.isEmpty()) { NONE } else { - reverseMap[type.toUpperCase(Locale.US)] ?: UNKNOWN + reverseMap[type.uppercase(Locale.US)] ?: UNKNOWN } } } diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt index 4a71d07772e6..c8c51a4485ce 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/BooleanTypeAdapter.kt @@ -16,7 +16,7 @@ internal class BooleanTypeAdapter : JsonDeserializer { return when { jsonPrimitive.isBoolean -> jsonPrimitive.asBoolean jsonPrimitive.isNumber -> jsonPrimitive.asNumber.toInt() == 1 - jsonPrimitive.isString -> TRUE_STRINGS.contains(jsonPrimitive.asString.toLowerCase( + jsonPrimitive.isString -> TRUE_STRINGS.contains(jsonPrimitive.asString.lowercase( Locale.getDefault() )) else -> false diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt index b80f4cda65d8..cbbcab67c155 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/NotificationStore.kt @@ -74,7 +74,7 @@ class NotificationStore @Inject constructor( companion object { private val reverseMap = values().associateBy(DeviceRegistrationErrorType::name) - fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR + fun fromString(type: String) = reverseMap[type.uppercase(Locale.US)] ?: GENERIC_ERROR } } @@ -147,7 +147,7 @@ class NotificationStore @Inject constructor( companion object { private val reverseMap = values().associateBy(NotificationErrorType::name) - fun fromString(type: String) = reverseMap[type.toUpperCase(Locale.US)] ?: GENERIC_ERROR + fun fromString(type: String) = reverseMap[type.uppercase(Locale.US)] ?: GENERIC_ERROR } } diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt index 2e1e8b51277b..4242074a3062 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/PageStore.kt @@ -83,8 +83,8 @@ class PageStore @Inject constructor( suspend fun search(site: SiteModel, searchQuery: String): List = coroutineEngine.withDefaultContext(AppLog.T.POSTS, this, "search") { getPagesFromDb(site).filter { - it.title.toLowerCase(Locale.ROOT) - .contains(searchQuery.toLowerCase(Locale.ROOT)) + it.title.lowercase(Locale.ROOT) + .contains(searchQuery.lowercase(Locale.ROOT)) } } diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt index 1fc2d7e52165..fbe5579353ee 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/QuickStartStore.kt @@ -11,6 +11,7 @@ import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUST import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GET_TO_KNOW_APP import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW import org.wordpress.android.util.AppLog +import java.io.Serializable import javax.inject.Inject import javax.inject.Singleton @@ -19,7 +20,7 @@ class QuickStartStore @Inject constructor( private val quickStartSqlUtils: QuickStartSqlUtils, dispatcher: Dispatcher ) : Store(dispatcher) { - interface QuickStartTask { + interface QuickStartTask: Serializable { val string: String val taskType: QuickStartTaskType val order: Int diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt index c4a25ef41964..4d4622f6e2d8 100644 --- a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt +++ b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.kt @@ -1012,7 +1012,7 @@ open class SiteStore @Inject constructor( private const val SITE = "SITE" @JvmStatic fun fromString(string: String): NewSiteErrorType { if (!TextUtils.isEmpty(string)) { - val siteString = string.toUpperCase(Locale.US).replace(BLOG, SITE) + val siteString = string.uppercase(Locale.US).replace(BLOG, SITE) for (v in values()) { if (siteString.equals(v.name, ignoreCase = true)) { return v