From 347b88eb5e99435abbe89c69913ed866f935cc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= <benoit@quenaudon.com>
Date: Tue, 3 Feb 2026 16:34:29 +0000
Subject: [PATCH] Bump Kotlin to 2.2.20 and Wire to 4.9.7

---
 build.gradle.kts                                       |  6 +++---
 cli/build.gradle.kts                                   |  4 ----
 protogram/build.gradle.kts                             | 10 ++++++++--
 .../kotlin/com/mattprecious/protogram/protogram.kt     |  3 +++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 59dab89..54d9498 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   base
-  kotlin("multiplatform") version "1.6.21" apply false
-  kotlin("jvm") version "1.6.21" apply false
-  kotlin("js") version "1.6.21" apply false
+  kotlin("multiplatform") version "2.2.20" apply false
+  kotlin("jvm") version "2.2.20" apply false
+  kotlin("js") version "2.2.20" apply false
   id("org.jlleitschuh.gradle.ktlint") version "9.1.1" apply false
 }
 
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index 6312641..54cefba 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -14,10 +14,6 @@ dependencies {
   testImplementation("com.google.jimfs", "jimfs", "1.1")
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = "1.8"
-}
-
 val fatJar = task("fatJar", type = Jar::class) {
   setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
   from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
diff --git a/protogram/build.gradle.kts b/protogram/build.gradle.kts
index ac55647..79ffc7c 100644
--- a/protogram/build.gradle.kts
+++ b/protogram/build.gradle.kts
@@ -3,7 +3,13 @@ plugins {
   id("org.jlleitschuh.gradle.ktlint")
 }
 
+repositories {
+  mavenCentral()
+}
+
 kotlin {
+  jvmToolchain(17)
+
   jvm()
   js {
     browser()
@@ -14,8 +20,8 @@ kotlin {
       dependencies {
         api(kotlin("stdlib-common"))
         implementation(project(":tinsel"))
-        api("com.squareup.okio:okio-multiplatform:2.4.2")
-        api("com.squareup.wire:wire-schema-multiplatform:3.1.0")
+        api("com.squareup.okio:okio:3.7.0")
+        api("com.squareup.wire:wire-schema:4.9.7")
       }
     }
     commonTest {
diff --git a/protogram/src/commonMain/kotlin/com/mattprecious/protogram/protogram.kt b/protogram/src/commonMain/kotlin/com/mattprecious/protogram/protogram.kt
index df73ba5..37a5781 100644
--- a/protogram/src/commonMain/kotlin/com/mattprecious/protogram/protogram.kt
+++ b/protogram/src/commonMain/kotlin/com/mattprecious/protogram/protogram.kt
@@ -12,6 +12,7 @@ import com.squareup.wire.FieldEncoding.LENGTH_DELIMITED
 import com.squareup.wire.FieldEncoding.VARINT
 import com.squareup.wire.ProtoReader
 import com.squareup.wire.schema.EnumType
+import com.squareup.wire.schema.EnclosingType
 import com.squareup.wire.schema.MessageType
 import com.squareup.wire.schema.ProtoType
 import com.squareup.wire.schema.Schema
@@ -34,6 +35,8 @@ private fun ProtoReader.readTree(schema: Schema?, type: ProtoType?): Tree {
         var fieldName = tag.toString()
         if (schema != null && type != null) {
           when (val schemaType = schema.getType(type)) {
+            null -> {}
+            is EnclosingType -> {}
             is MessageType -> {
               val field = schemaType.field(tag)
               if (field != null) {