From 1fe8f1f0e69cdab4342624fb521d1abf61cd6912 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Thu, 24 Jul 2025 09:10:50 +0200 Subject: [PATCH] [android] Bump dependencies Signed-off-by: Jean-Baptiste Charron --- .../java/org/chromium/base/ObserverList.java | 3 --- android/gradle/libs.versions.toml | 10 +++++----- android/gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- android/gradlew | 4 ++-- android/gradlew.bat | 4 ++-- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/android/app/src/main/java/org/chromium/base/ObserverList.java b/android/app/src/main/java/org/chromium/base/ObserverList.java index 16ae0d08b..fa6bc36ba 100644 --- a/android/app/src/main/java/org/chromium/base/ObserverList.java +++ b/android/app/src/main/java/org/chromium/base/ObserverList.java @@ -12,8 +12,6 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import javax.annotation.concurrent.NotThreadSafe; - /** * A container for a list of observers. *

@@ -31,7 +29,6 @@ import javax.annotation.concurrent.NotThreadSafe; * * @param The type of observers that this list should hold. */ -@NotThreadSafe public class ObserverList implements Iterable { /** Extended iterator interface that provides rewind functionality. */ public interface RewindableIterator extends Iterator { diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 28e4418ab..9613d2668 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidGradlePlugin = "8.9.3" -androidxCarApp = "1.7.0-rc01" +androidGradlePlugin = "8.10.1" +androidxCarApp = "1.7.0" [libraries] android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } @@ -18,10 +18,10 @@ androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayo androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.8" } androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" } -androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.1" } -androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.1" } +androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.2" } +androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.2" } android-material = { module = "com.google.android.material:material", version = "1.12.0" } -google-guava = { module = "com.google.guava:guava", version = "33.3.1-android" } +google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" } devnullorthrow-mpandroidchart = { module = "com.github.devnullorthrow:MPAndroidChart", version = "3.2.0-alpha" } jcip-annotations = { module = "net.jcip:jcip-annotations", version = "1.0" } androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ccf4a0811..925106986 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 +distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 diff --git a/android/gradlew b/android/gradlew index faf93008b..23d15a936 100755 --- a/android/gradlew +++ b/android/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/android/gradlew.bat b/android/gradlew.bat index 9d21a2183..db3a6ac20 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell