From 7c2c5d0672e701eeac25e8efe0b2746c7fee11de Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 5 Jul 2024 11:00:41 +0100 Subject: [PATCH 1/7] Android Gradle Plugin 8.5.0. 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 27ec22e39c..c35d9a86cf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ room = "2.6.1" [libraries] 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.1" } +android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.0" } 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 = "2.1.4" } From 9df6ce7afb1ff1c62598e03f4dab1fa0346580da Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 5 Jul 2024 11:29:44 +0100 Subject: [PATCH 2/7] 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 c35d9a86cf..f89d0c83f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,9 +7,9 @@ lint = "31.4.0" room = "2.6.1" [libraries] +android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.0" } 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.5.0" } 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 = "2.1.4" } From e615f92d234b7b7296f4d1635f3846b433d710b6 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 5 Jul 2024 14:11:19 +0100 Subject: [PATCH 3/7] Round of dependency updates. Signed-off-by: Kenneth J. Shackleton --- gradle/libs.versions.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f89d0c83f6..5465f676f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,25 +3,25 @@ [versions] benchmark = "1.2.4" jmh = "1.37" -lint = "31.4.0" +lint = "31.5.0" room = "2.6.1" [libraries] android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.0" } 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" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" } 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-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.3" } +androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.3.0" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", 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" } +androidx-test-ext = { group = "androidx.test.ext", name = "junit", version = "1.2.1" } +androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.6.1" } +androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.1" } findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" } 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" } @@ -31,7 +31,7 @@ kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "1 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.8.0" } +kotlinx-coroutines-bom = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-bom", version = "1.8.1" } 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 550f3299ffdea4962ae8de264973e948665c8970 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 16 Aug 2024 21:01:26 +0100 Subject: [PATCH 4/7] Switch to using the new OSSRH publication credential. Signed-off-by: Kenneth J. Shackleton --- .github/workflows/publication.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index 33915c7a82..7be8b1e8b0 100644 --- a/.github/workflows/publication.yml +++ b/.github/workflows/publication.yml @@ -43,8 +43,8 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY_ID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_KEY_PASSPHRASE }} - ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_USER_TOKEN_PASSWORD }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USER_TOKEN_USERNAME }} run: | ./gradlew \ publishMainPublicationToSonatypeRepository \ @@ -55,8 +55,8 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEY_ID }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_KEY_PASSPHRASE }} - ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }} - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_USER_TOKEN_PASSWORD }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USER_TOKEN_USERNAME }} run: | ./gradlew \ -Prelease \ From 99f7d67bdd3eadabbb84add6c99dac5ae0c49a8f Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Fri, 16 Aug 2024 21:57:34 +0100 Subject: [PATCH 5/7] Gradle 8.10. Signed-off-by: Kenneth J. Shackleton --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8725301203..5dcd8c1705 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=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip networkTimeout=120000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From daaad9623766e4de8e1874622ae35a1d5a3ffef7 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 17 Aug 2024 08:17:19 +0100 Subject: [PATCH 6/7] Android Gradle Plugin 8.5.2. 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 5465f676f9..004b2d09ec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ lint = "31.5.0" room = "2.6.1" [libraries] -android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.0" } +android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.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" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } From 5d0d96e5ee654b475d30e55a3e66d14b4ac6a632 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 17 Aug 2024 08:43:06 +0100 Subject: [PATCH 7/7] Round of dependency updates. Signed-off-by: Kenneth J. Shackleton --- gradle/libs.versions.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 004b2d09ec..43f5166711 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ [versions] benchmark = "1.2.4" jmh = "1.37" -lint = "31.5.0" +lint = "31.5.2" room = "2.6.1" [libraries] @@ -14,14 +14,14 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" } 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-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.3" } -androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.3.0" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.4" } +androidx-paging = { group = "androidx.paging", name = "paging-runtime", version = "3.3.2" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", 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.2.1" } androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.6.1" } -androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.1" } +androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.2" } findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" } 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" } @@ -43,7 +43,7 @@ robolectric-android-all = { group = "org.robolectric", name = "android-all", ver androidx-benchmark = { id = "androidx.benchmark", version.ref = "benchmark" } cash-licensee = { id = "app.cash.licensee", version = "1.6.0" } detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" } -dokka = { id = "org.jetbrains.dokka", version = "1.9.10" } +dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.0" }