diff --git a/android/app/build.gradle b/android/app/build.gradle index c16af96de..7193a1cbd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -390,7 +390,6 @@ dependencies { androidTestImplementation libs.androidx.test.junit testImplementation libs.junit testImplementation libs.mockito.core - testImplementation libs.mockito.inline } tasks.withType(JavaCompile) { diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 84c1111d4..33f8bc9dd 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,34 +1,32 @@ [versions] -androidGradlePlugin = "8.7.3" +androidGradlePlugin = "8.9.3" androidxCarApp = "1.7.0-rc01" [libraries] android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } -google-services = { module = "com.google.gms:google-services", version = "4.4.2" } -triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.10.1" } +triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" } huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" } -android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.4" } +android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" } microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" } -androidx-core = { module = "androidx.core:core", version = "1.15.0" } -jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.1.10" } +androidx-core = { module = "androidx.core:core", version = "1.16.0" } +jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.1.21" } androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" } androidx-car-app-projected = { module = "androidx.car.app:app-projected", version.ref = "androidxCarApp" } -androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.0" } -androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.5" } +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" } +androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.7" } androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" } -androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.3.2" } -androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.0" } -androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.8.7" } +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.0" } android-material = { module = "com.google.android.material:material", version = "1.12.0" } -google-guava = { module = "com.google.guava:guava", version = "33.3.0-android" } +google-guava = { module = "com.google.guava:guava", version = "33.3.1-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" } junit = { module = "junit:junit", version = "4.13.2" } -mockito-core = { module = "org.mockito:mockito-core", version = "5.15.2" } -mockito-inline = { module = "org.mockito:mockito-inline", version = "5.2.0" } +mockito-core = { module = "org.mockito:mockito-core", version = "5.18.0" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index a4b76b953..9bbc975c7 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e18bc253b..37f853b1c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index f5feea6d6..faf93008b 100755 --- a/android/gradlew +++ b/android/gradlew @@ -86,8 +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 -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || 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 @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line.