From c554a251ddb9a79775a6adce7d1289d065eb402e Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 3 May 2024 07:30:24 +0100 Subject: [PATCH 1/2] Round of dependency updates. Signed-off-by: Kenneth J. Shackleton --- gradle/libs.versions.toml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa897bc6f4..0e74351c01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,18 +2,20 @@ [versions] benchmark = "1.2.4" +jmh = "1.37" +lint = "31.4.0" room = "2.6.1" [libraries] -android-tools-lint = { group = "com.android.tools.lint", name = "lint", version = "31.3.2" } -android-tools-lint-api = { group = "com.android.tools.lint", name = "lint-api", version = "31.3.2" } +android-tools-lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" } +android-tools-lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" } android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.4.0" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.0.2" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" } androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "1.1.3" } -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.0.2" } -androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "2.1.0" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.5.1" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.13.1" } +androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.2.1" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.7.0" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } @@ -21,15 +23,15 @@ androidx-test-ext = { group = "androidx.test.ext", name = "junit", version = "1. androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.5.0" } androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" } findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" } -jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version = "1.36" } -jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version = "1.36" } +jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" } +jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" } junit-junit = { group = "junit", name = "junit", version = "4.13.2" } junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version = "5.10.2" } kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "1.9.23" } kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" } kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" } kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit" } -kotlinx-coroutines-bom = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-bom", version = "1.7.3" } +kotlinx-coroutines-bom = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-bom", version = "1.8.0" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core" } mockito-core = { group = "org.mockito", name = "mockito-core", version = "5.11.0" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version = "5.3.1" } From 7aec5a80d3b2fa224404022d067f353099602bb6 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 3 May 2024 07:31:55 +0100 Subject: [PATCH 2/2] Lexicographical order. Signed-off-by: Kenneth J. Shackleton --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e74351c01..8442db3b56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.1 androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.2.1" } androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.7.0" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } -androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } androidx-test-ext = { group = "androidx.test.ext", name = "junit", version = "1.1.5" } androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.5.0" } androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" }