From db91d69b0ee6bf99924a5891532eeb89e235a7cd Mon Sep 17 00:00:00 2001
From: "Philip K. Warren" <pwarren@buf.build>
Date: Mon, 18 Sep 2023 12:09:22 -0500
Subject: [PATCH] Update Kotlin to 1.9.10 to allow other upgrades

Prior to upgrading other dependencies, we should update Kotlin to 1.9.10
(latest version).
---
 Makefile                          |  2 +-
 examples/android/build.gradle.kts | 13 ++++++-------
 gradle/libs.versions.toml         | 22 +++++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 15dadc9d..033553c2 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ BIN := .tmp/bin
 CACHE := .tmp/cache
 LICENSE_HEADER_YEAR_RANGE := 2022-2023
 LICENSE_HEADER_VERSION := v1.26.1
-PROTOC_VERSION ?= 24.1
+PROTOC_VERSION ?= 24.3
 GRADLE_ARGS ?=
 
 UNAME_OS := $(shell uname -s)
diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
index efd05707..0d19ff62 100644
--- a/examples/android/build.gradle.kts
+++ b/examples/android/build.gradle.kts
@@ -23,13 +23,12 @@ android {
 }
 
 dependencies {
-    // TODO: add deps to libs.versions.toml
-    implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.recyclerview:recyclerview:1.2.1")
-    implementation("com.android.support:multidex:1.0.3")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
-    implementation("com.google.android.material:material:1.4.0")
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintLayout)
+    implementation(libs.androidx.recyclerview)
+    implementation(libs.android.multidex)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.android.material)
 
     implementation(project(":okhttp"))
     implementation(project(":examples:generated-google-javalite"))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8992d7fa..ee7a35c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,26 +1,30 @@
 [versions]
 android = "4.1.1.4"
 assertj = "3.11.0"
-coroutines = "1.5.2"
-dokka = "1.5.30"
+coroutines = "1.7.3"
+dokka = "1.9.0"
 junit = "4.13.2"
-kotlin = "1.6.21"
-kotlinpoet = "1.12.0"
+kotlin = "1.9.10"
+kotlinpoet = "1.14.2"
 ktlint = "0.46.0"
 mavenplugin = "0.24.0"
-moshi = "1.14.0"
+moshi = "1.15.0"
 okhttp = "4.10.0"
 okio = "3.0.0"
-protobuf = "3.24.1"
+protobuf = "3.24.3"
 
 [libraries]
 android = { module = "com.google.android:android", version.ref = "android" }
+android-material = { module = "com.google.android.material:material", version = "1.4.0" }
+android-multidex = { module = "com.android.support:multidex", version = "1.0.3" }
 android-plugin = { module = "com.android.tools.build:gradle", version = "8.1.1" }
 androidx-annotations = { module = "androidx.annotation:annotation", version = "1.1.0" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.0.2" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.5.1" }
 androidx-compose = { module = "androidx.activity:activity-compose", version = "1.4.0" }
-androidx-constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version = "1.1.3" }
+androidx-constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" }
 androidx-ktx = { module = "androidx.core:core-ktx", version = "1.0.2" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", "version" = "1.2.1" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 dokka-core = { module = "org.jetbrains.dokka:dokka-core", version.ref = "dokka" }
 dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
@@ -50,4 +54,4 @@ testcontainers = { module = "org.testcontainers:testcontainers", version = "1.19
 
 [plugins]
 git = { id = "com.palantir.git-version", version = "3.0.0" }
-ksp = { id = "com.google.devtools.ksp", version = "1.6.21-1.0.6" }
+ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }