Skip to content

Commit 93ff765

Browse files
ParaskP7ParaskP7
authored
[Build] Update Gradle to 8.12.1 and AGP to 8.8.1 (#21680)
* Build: Upgrade agp to 8.6.1 Release Notes: https://developer.android.com/build/releases/ past-releases/agp-8-6-0-release-notes * Build: Upgrade gradle to 8.9 Release Notes: https://docs.gradle.org/8.9/release-notes.html Command: ./gradlew wrapper --gradle-version=8.9 --distribution-type=all --gradle-distribution-sha256-sum= 258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70 * Build: Upgrade agp to 8.7.3 Release Notes: https://developer.android.com/build/releases/ past-releases/agp-8-7-0-release-notes * Build: Upgrade gradle to 8.10.2 Release Notes: https://docs.gradle.org/8.10.2/release-notes.html Command: ./gradlew wrapper --gradle-version=8.10.2 --distribution-type=all --gradle-distribution-sha256-sum= 2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6 * Build: Upgrade agp to 8.8.0 Release Notes: https://developer.android.com/build/releases/ gradle-plugin * Build: Upgrade gradle to 8.11.1 Release Notes: https://docs.gradle.org/8.11.1/release-notes.html Command: ./gradlew wrapper --gradle-version=8.11.1 --distribution-type=all --gradle-distribution-sha256-sum= 89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a * Build: Upgrade gradle to 8.12.1 Release Notes: https://docs.gradle.org/8.12.1/release-notes.html Command: ./gradlew wrapper --gradle-version=8.12.1 --distribution-type=all --gradle-distribution-sha256-sum= 296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175 * Analysis: Suppress credential manager misuse lint warning on login mdl This Lint warning can be suppressed because 'NoCredentialException' is actually a subclass of 'GetCredentialException', which means that it is already caught. Warning Message: "Call to CredentialManager.getCredential without use of NoCredentialException" Explanation: "When calling CredentialManager.getCredential or CredentialManager.getCredentialAsync, you should handle NoCredentialException somewhere in your project. More info: https://developer.android.com/identity/sign-in/ credential-manager#handle-exceptions" * Analysis: Suppress set text i18n lint warnings on wordpress module I18n is not actually needed on these specific cases. Warning Messages: "Number formatting does not take into account locale settings. Consider using String.format instead." Explanation: "When calling TextView#setText * Never call Number#toString() to format numbers; it will not handle fraction separators and locale-specific digits properly. Consider using String#format with proper format specifications (%d or %f) instead. * Do not pass a string literal (e.g. "Hello") to display text. Hardcoded text can not be properly translated to other languages. Consider using Android resource strings instead. * Do not build messages by concatenating text chunks. Such messages can not be properly translated. More info: https://developer.android.com/guide/topics/resources/ localization.html" * Deps: Update gutenberg kit version to pr hash This 'Gutenberg Kit' PR hash updates the library to that branch version where 'Gradle & AGP' is also upgraded to version '8.12.1 & 8.8.0' respectively. Gutenberg Kit PR: https://github.com/wordpress-mobile/ GutenbergKit/pull/92 This step is required in order to check that these 'Gutenberg Kit' related changes work as expected for JP/WPAndroid. * Deps: Update gutenberg kit version to pr hash (v2) This 'Gutenberg Kit' PR hash updates the library to that branch version where 'Gradle & AGP' is also upgraded to version '8.12.1 & 8.8.0' respectively. Gutenberg Kit PR: https://github.com/wordpress-mobile/ GutenbergKit/pull/92 This step is required in order to check that these 'Gutenberg Kit' related changes work as expected for JP/WPAndroid. * Build: Upgrade agp to 8.8.1 Release Notes: https://developer.android.com/build/releases/ gradle-plugin * Deps: Update gutenberg kit version to pr hash (v3) This 'Gutenberg Kit' PR hash updates the library to that branch version where 'Gradle & AGP' is also upgraded to version '8.12.1 & 8.8.1' respectively. Gutenberg Kit PR: https://github.com/wordpress-mobile/ GutenbergKit/pull/92 This step is required in order to check that these 'Gutenberg Kit' related changes work as expected for JP/WPAndroid. * Deps: Update gutenberg kit version to trunk hash This 'Gutenberg Kit' trunk hash updates the library to that branch version where 'Gradle & AGP' is also upgraded to version '8.12.1 & 8.8.1' respectively. Gutenberg Kit PR: https://github.com/wordpress-mobile/ GutenbergKit/pull/92 This step is required in order to check that these 'Gutenberg Kit' related changes work as expected for JP/WPAndroid.
1 parent 7c3d45d commit 93ff765

File tree

10 files changed

+20
-5
lines changed

10 files changed

+20
-5
lines changed

‎WordPress/src/main/java/org/wordpress/android/ui/history/RevisionItemViewHolder.kt

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.wordpress.android.ui.history
22

3+
import android.annotation.SuppressLint
34
import android.os.Bundle
45
import android.text.TextUtils
56
import android.view.View
@@ -46,13 +47,15 @@ class RevisionItemViewHolder(
4647
diffLayout.visibility = View.VISIBLE
4748

4849
if (boundRevision.totalAdditions > 0) {
50+
@SuppressLint("SetTextI18n")
4951
diffAdditions.text = boundRevision.totalAdditions.toString()
5052
diffAdditions.visibility = View.VISIBLE
5153
} else {
5254
diffAdditions.visibility = View.GONE
5355
}
5456

5557
if (boundRevision.totalDeletions > 0) {
58+
@SuppressLint("SetTextI18n")
5659
diffDeletions.text = boundRevision.totalDeletions.toString()
5760
diffDeletions.visibility = View.VISIBLE
5861
} else {

‎WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders
22

3+
import android.annotation.SuppressLint
34
import android.text.Spannable
45
import android.text.SpannableString
56
import android.text.style.ForegroundColorSpan
@@ -28,6 +29,7 @@ class ThreatContextLineViewHolder(
2829
private fun updateLineNumber(itemState: ThreatContextLineItemState) {
2930
with(binding.lineNumber) {
3031
setBackgroundColor(ContextCompat.getColor(itemView.context, itemState.lineNumberBackgroundColorRes))
32+
@SuppressLint("SetTextI18n")
3133
text = itemState.line.lineNumber.toString()
3234
}
3335
}

‎WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActionModeCallback.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.wordpress.android.ui.mediapicker
22

3+
import android.annotation.SuppressLint
34
import android.view.Menu
45
import android.view.MenuItem
56
import android.view.View
@@ -50,6 +51,7 @@ class MediaPickerActionModeCallback(private val viewModel: MediaPickerViewModel)
5051
editItem.actionView?.findViewById<TextView>(R.id.customize_icon_count)?.let { editItemBadge ->
5152
if (editItemUiModel.isCounterBadgeVisible) {
5253
editItemBadge.visibility = View.VISIBLE
54+
@SuppressLint("SetTextI18n")
5355
editItemBadge.text = editItemUiModel.counterBadgeValue.toString()
5456
} else {
5557
editItemBadge.visibility = View.GONE

‎WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/SubscribersChartMarkerView.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.wordpress.android.ui.stats.refresh
22

3+
import android.annotation.SuppressLint
34
import android.content.Context
45
import android.graphics.BlurMaskFilter
56
import android.graphics.BlurMaskFilter.Blur.NORMAL
@@ -46,6 +47,7 @@ class SubscribersChartMarkerView @Inject constructor(
4647
val yValue = dataSet.values[index].y
4748

4849
val count = yValue.toLong()
50+
@SuppressLint("SetTextI18n")
4951
countView.text = count.toString()
5052
val label = if (count > 1) {
5153
R.string.stats_subscribers_marker_view_plural

‎gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = '8.5.1'
2+
agp = '8.8.1'
33
airbnb-lottie = '6.6.2'
44
android-desugar = '2.1.4'
55
android-installreferrer = '2.2'
@@ -72,7 +72,7 @@ google-play-services-auth = '20.4.1'
7272
google-services = '4.4.2'
7373
gravatar = '2.3.1'
7474
greenrobot-eventbus = '3.3.1'
75-
gutenberg-kit = 'trunk-7894ff454cf2a889dd4634e031c1a0323d7f3d08'
75+
gutenberg-kit = 'trunk-c7efee1859bacda21537ba144ac55c8abe4eaec8'
7676
gutenberg-mobile = 'v1.121.0'
7777
indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
7878
jackson-databind = '2.12.7.1'

‎gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum

‎gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎libs/login/src/main/java/org/wordpress/android/login/webauthn/PasskeyRequest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.wordpress.android.login.webauthn
22

3+
import android.annotation.SuppressLint
34
import android.content.Context
45
import android.os.CancellationSignal
56
import android.util.Log
@@ -18,6 +19,7 @@ import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder
1819
import org.wordpress.android.fluxc.store.AccountStore.FinishWebauthnChallengePayload
1920
import java.util.concurrent.Executors
2021

22+
@SuppressLint("CredentialManagerMisuse")
2123
class PasskeyRequest private constructor(
2224
context: Context,
2325
requestData: PasskeyRequestData,

0 commit comments

Comments
 (0)