From 961f9865ac0f4aaa52dba631dc87704a7815e37e Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Tue, 31 Mar 2026 11:10:08 -0400
Subject: [PATCH 1/3] Bump protocolbuffers/kotlin v34.1 kotlin compiler version

Seems like this was maybe bumped here:

https://github.com/protocolbuffers/protobuf/commit/763c5da3ff011a49f1c00992cdf9b4924d6b74bb#diff-6136fc12446089c3db7360e923203dd114b6a1466252e71667c6791c20fe6bdcR38

Failing to compile upstream.

Similar to
https://github.com/bufbuild/plugins/commit/c3b930c15c437eb862a7c88013c4baffca7f2e08.
---
 plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml b/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
index 089200654..f16053300 100644
--- a/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
+++ b/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
@@ -14,14 +14,15 @@ registry:
   maven:
     compiler:
       kotlin:
-        version: 1.8.22
+        api_version: "1.8"
+        version: "2.2.21"
     deps:
       - com.google.protobuf:protobuf-kotlin:4.34.1
-      - org.jetbrains.kotlin:kotlin-stdlib:1.8.22
-      - org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
+      - org.jetbrains.kotlin:kotlin-stdlib:2.2.21
+      - org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
     additional_runtimes:
       - name: lite
         deps:
           - com.google.protobuf:protobuf-kotlin-lite:4.34.1
-          - org.jetbrains.kotlin:kotlin-stdlib:1.8.22
+          - org.jetbrains.kotlin:kotlin-stdlib:2.2.21
         opts: [lite]

From 18822657452c2ebf5fa12dbeb7ab71f92e5b8e0f Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Tue, 31 Mar 2026 11:23:49 -0400
Subject: [PATCH 2/3] Upgrade api_version and match pom.xml

---
 plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml | 2 +-
 plugins/protocolbuffers/kotlin/v34.1/pom.xml         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml b/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
index f16053300..fc29a76bc 100644
--- a/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
+++ b/plugins/protocolbuffers/kotlin/v34.1/buf.plugin.yaml
@@ -14,7 +14,7 @@ registry:
   maven:
     compiler:
       kotlin:
-        api_version: "1.8"
+        api_version: "2.1"
         version: "2.2.21"
     deps:
       - com.google.protobuf:protobuf-kotlin:4.34.1
diff --git a/plugins/protocolbuffers/kotlin/v34.1/pom.xml b/plugins/protocolbuffers/kotlin/v34.1/pom.xml
index cc5fd4b59..97bc7d9ef 100644
--- a/plugins/protocolbuffers/kotlin/v34.1/pom.xml
+++ b/plugins/protocolbuffers/kotlin/v34.1/pom.xml
@@ -12,12 +12,12 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.8.22</version>
+      <version>2.2.21</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.8.22</version>
+      <version>2.2.21</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>1.8.22</version>
+        <version>2.2.21</version>
         <configuration>
         </configuration>
       </plugin>

From 7aebdf8737b7af885a5e79a17add8607877bac69 Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Tue, 31 Mar 2026 11:43:31 -0400
Subject: [PATCH 3/3] Add apiVersion to configuration

---
 plugins/protocolbuffers/kotlin/v34.1/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/protocolbuffers/kotlin/v34.1/pom.xml b/plugins/protocolbuffers/kotlin/v34.1/pom.xml
index 97bc7d9ef..2d122b6a1 100644
--- a/plugins/protocolbuffers/kotlin/v34.1/pom.xml
+++ b/plugins/protocolbuffers/kotlin/v34.1/pom.xml
@@ -48,6 +48,7 @@
         <artifactId>kotlin-maven-plugin</artifactId>
         <version>2.2.21</version>
         <configuration>
+          <apiVersion>2.1</apiVersion>
         </configuration>
       </plugin>
     </plugins>