diff --git a/WordPress/src/main/java/org/wordpress/android/ui/history/RevisionItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/history/RevisionItemViewHolder.kt index c806d3de6ef9..ffc587f61df9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/history/RevisionItemViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/history/RevisionItemViewHolder.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.history +import android.annotation.SuppressLint import android.os.Bundle import android.text.TextUtils import android.view.View @@ -46,6 +47,7 @@ class RevisionItemViewHolder( diffLayout.visibility = View.VISIBLE if (boundRevision.totalAdditions > 0) { + @SuppressLint("SetTextI18n") diffAdditions.text = boundRevision.totalAdditions.toString() diffAdditions.visibility = View.VISIBLE } else { @@ -53,6 +55,7 @@ class RevisionItemViewHolder( } if (boundRevision.totalDeletions > 0) { + @SuppressLint("SetTextI18n") diffDeletions.text = boundRevision.totalDeletions.toString() diffDeletions.visibility = View.VISIBLE } else { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt index 90e403d278c9..21612c5e5ae2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders +import android.annotation.SuppressLint import android.text.Spannable import android.text.SpannableString import android.text.style.ForegroundColorSpan @@ -28,6 +29,7 @@ class ThreatContextLineViewHolder( private fun updateLineNumber(itemState: ThreatContextLineItemState) { with(binding.lineNumber) { setBackgroundColor(ContextCompat.getColor(itemView.context, itemState.lineNumberBackgroundColorRes)) + @SuppressLint("SetTextI18n") text = itemState.line.lineNumber.toString() } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActionModeCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActionModeCallback.kt index e9bc13b9b927..0d43918b337f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActionModeCallback.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActionModeCallback.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.mediapicker +import android.annotation.SuppressLint import android.view.Menu import android.view.MenuItem import android.view.View @@ -50,6 +51,7 @@ class MediaPickerActionModeCallback(private val viewModel: MediaPickerViewModel) editItem.actionView?.findViewById(R.id.customize_icon_count)?.let { editItemBadge -> if (editItemUiModel.isCounterBadgeVisible) { editItemBadge.visibility = View.VISIBLE + @SuppressLint("SetTextI18n") editItemBadge.text = editItemUiModel.counterBadgeValue.toString() } else { editItemBadge.visibility = View.GONE diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/SubscribersChartMarkerView.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/SubscribersChartMarkerView.kt index 22821ee61c3f..145cf277505b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/SubscribersChartMarkerView.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/SubscribersChartMarkerView.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh +import android.annotation.SuppressLint import android.content.Context import android.graphics.BlurMaskFilter import android.graphics.BlurMaskFilter.Blur.NORMAL @@ -46,6 +47,7 @@ class SubscribersChartMarkerView @Inject constructor( val yValue = dataSet.values[index].y val count = yValue.toLong() + @SuppressLint("SetTextI18n") countView.text = count.toString() val label = if (count > 1) { R.string.stats_subscribers_marker_view_plural diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98ab08805b9f..93147e1486e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = '8.5.1' +agp = '8.8.1' airbnb-lottie = '6.6.2' android-desugar = '2.1.4' android-installreferrer = '2.2' @@ -72,7 +72,7 @@ google-play-services-auth = '20.4.1' google-services = '4.4.2' gravatar = '2.3.1' greenrobot-eventbus = '3.3.1' -gutenberg-kit = 'trunk-7894ff454cf2a889dd4634e031c1a0323d7f3d08' +gutenberg-kit = 'trunk-c7efee1859bacda21537ba144ac55c8abe4eaec8' gutenberg-mobile = 'v1.121.0' indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' jackson-databind = '2.12.7.1' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4..a4b76b9530d6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 515ab9d5f182..b8cea9f02a5b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip +distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13397a..f3b75f3b0d4f 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbdeee..9d21a21834d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/libs/login/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt b/libs/login/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt index 096a006112ca..f92098ffc395 100644 --- a/libs/login/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt +++ b/libs/login/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt @@ -1,5 +1,6 @@ package org.wordpress.android.login.webauthn +import android.annotation.SuppressLint import android.content.Context import android.os.CancellationSignal import android.util.Log @@ -18,6 +19,7 @@ import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder import org.wordpress.android.fluxc.store.AccountStore.FinishWebauthnChallengePayload import java.util.concurrent.Executors +@SuppressLint("CredentialManagerMisuse") class PasskeyRequest private constructor( context: Context, requestData: PasskeyRequestData,