From 49f660330287a44103a0dba0f07f2e0ec1b8fccc Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:37:53 +0000 Subject: [PATCH 1/8] Kotlin 1.9.22. Signed-off-by: Kenneth J. Shackleton --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3cc9915a54..73b475e83d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,7 @@ */ // TODO Move me. -val kotlinVersion = "1.9.10" +val kotlinVersion = "1.9.22" plugins { `kotlin-dsl` diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5e758781ee..8876f4426e 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -38,7 +38,7 @@ enum class Versions( JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")), JUNIT4("4.13.2", URL("https://github.com/junit-team/junit4")), JUNIT5("5.9.3", URL("https://junit.org/junit5/")), - KOTLIN("1.9.10", URL("https://github.com/JetBrains/kotlin")), + KOTLIN("1.9.22", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")), KOTLINX_KOVER("0.7.2", URL("https://github.com/Kotlin/kotlinx-kover")), From aa07690f46d10d8b0090b10626e3086bb60d5673 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:38:48 +0000 Subject: [PATCH 2/8] Dokka 1.9.10. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8876f4426e..8b23e1a9d8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -30,7 +30,7 @@ enum class Versions( ANDROIDX_ROOM("2.5.1", URL("https://developer.android.com/jetpack/androidx/releases/room")), CMAKE("3.22.1", URL("https://cmake.org")), DETEKT("1.22.0", URL("https://github.com/arturbosch/detekt")), - DOKKA("1.8.20", URL("https://github.com/Kotlin/dokka")), + DOKKA("1.9.10", URL("https://github.com/Kotlin/dokka")), GRADLE_DOWNLOAD_TASK_PLUGIN("5.4.0", URL("https://github.com/michel-kraemer/gradle-download-task")), GRADLE_LICENSEE_PLUGIN("1.6.0", URL("https://github.com/cashapp/licensee")), IDE_EXT_GRADLE_PLUGIN("1.1.7", URL("https://github.com/JetBrains/gradle-idea-ext-plugin")), From d5c5f4f8b8146dc19159d1d540190afcd78f7193 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:39:46 +0000 Subject: [PATCH 3/8] Mockito 5.10.0, Mockito-Kotlin 5.3.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8b23e1a9d8..42ba52b8c3 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -44,8 +44,8 @@ enum class Versions( KOTLINX_KOVER("0.7.2", URL("https://github.com/Kotlin/kotlinx-kover")), KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.5.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), - MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")), - MOCKITO_KOTLIN("5.0.0", URL("https://github.com/mockito/mockito-kotlin")), + MOCKITO("5.10.0", URL("https://github.com/mockito/mockito")), + MOCKITO_KOTLIN("5.3.0", URL("https://github.com/mockito/mockito-kotlin")), NEXUS_PLUGIN("1.3.0", URL("https://github.com/gradle-nexus/publish-plugin")), QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")), ROBOLECTRIC_ANDROID_ALL("12.1-robolectric-8229987", URL("https://github.com/robolectric/robolectric")); From 783098fb5a6ccfe2c2912657c417cf5ecc25d438 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:40:20 +0000 Subject: [PATCH 4/8] Kotlin Coroutines 1.7.3. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 42ba52b8c3..1e7008bb94 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -40,7 +40,7 @@ enum class Versions( JUNIT5("5.9.3", URL("https://junit.org/junit5/")), KOTLIN("1.9.22", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), - KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")), + KOTLINX_COROUTINES("1.7.3", URL("https://github.com/Kotlin/kotlinx.coroutines")), KOTLINX_KOVER("0.7.2", URL("https://github.com/Kotlin/kotlinx-kover")), KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.5.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), From 261c77024ea89d2c431334281e717ddc8e65ddee Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:42:47 +0000 Subject: [PATCH 5/8] Room 2.6.1. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1e7008bb94..ad8cb1ae7f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -27,7 +27,7 @@ enum class Versions( ANDROID_NDK("26.1.10909125", URL("https://developer.android.com/ndk")), ANDROID_SDK("33", URL("https://developer.android.com/sdk")), ANDROIDX_LIVE_DATA("2.5.1", URL("https://developer.android.com/topic/libraries/architecture/livedata")), - ANDROIDX_ROOM("2.5.1", URL("https://developer.android.com/jetpack/androidx/releases/room")), + ANDROIDX_ROOM("2.6.1", URL("https://developer.android.com/jetpack/androidx/releases/room")), CMAKE("3.22.1", URL("https://cmake.org")), DETEKT("1.22.0", URL("https://github.com/arturbosch/detekt")), DOKKA("1.9.10", URL("https://github.com/Kotlin/dokka")), From f0262d9cdeb452db95d37cb092caea8c7bfe0463 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:47:39 +0000 Subject: [PATCH 6/8] Mockito-Kotlin 5.2.1. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ad8cb1ae7f..ba941e5ff7 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -45,7 +45,7 @@ enum class Versions( KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")), KTLINT_GRADLE_PLUGIN("11.5.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")), MOCKITO("5.10.0", URL("https://github.com/mockito/mockito")), - MOCKITO_KOTLIN("5.3.0", URL("https://github.com/mockito/mockito-kotlin")), + MOCKITO_KOTLIN("5.2.1", URL("https://github.com/mockito/mockito-kotlin")), NEXUS_PLUGIN("1.3.0", URL("https://github.com/gradle-nexus/publish-plugin")), QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")), ROBOLECTRIC_ANDROID_ALL("12.1-robolectric-8229987", URL("https://github.com/robolectric/robolectric")); From 2ab5b0e4cec3bb809e80813910cf168e1aab0ffb Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:48:44 +0000 Subject: [PATCH 7/8] Android SDK 34. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ba941e5ff7..e1c2f49d9e 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -25,7 +25,7 @@ enum class Versions( ANDROID_GRADLE_PLUGIN("8.0.2", URL("https://developer.android.com/tools/revisions/gradle-plugin.html")), ANDROID_LINT("30.0.2", URL("https://github.com/googlesamples/android-custom-lint-rules")), ANDROID_NDK("26.1.10909125", URL("https://developer.android.com/ndk")), - ANDROID_SDK("33", URL("https://developer.android.com/sdk")), + ANDROID_SDK("34", URL("https://developer.android.com/sdk")), ANDROIDX_LIVE_DATA("2.5.1", URL("https://developer.android.com/topic/libraries/architecture/livedata")), ANDROIDX_ROOM("2.6.1", URL("https://developer.android.com/jetpack/androidx/releases/room")), CMAKE("3.22.1", URL("https://cmake.org")), From c842e52d77cfc305160d830677f1521039415668 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sat, 3 Feb 2024 09:56:37 +0000 Subject: [PATCH 8/8] junit5 5.10.1. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e1c2f49d9e..c81b57066c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -37,7 +37,7 @@ enum class Versions( JMH("1.36", URL("https://openjdk.java.net/projects/code-tools/jmh/")), JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")), JUNIT4("4.13.2", URL("https://github.com/junit-team/junit4")), - JUNIT5("5.9.3", URL("https://junit.org/junit5/")), + JUNIT5("5.10.1", URL("https://junit.org/junit5/")), KOTLIN("1.9.22", URL("https://github.com/JetBrains/kotlin")), KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")), KOTLINX_COROUTINES("1.7.3", URL("https://github.com/Kotlin/kotlinx.coroutines")),