From 273ddcfb40832159c1ed15ed29138848b8bbe428 Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Fri, 13 Mar 2026 14:38:13 -0700
Subject: [PATCH] Update the IntelliJ plugin to gjf 1.35.0.

PiperOrigin-RevId: 883344262
---
 idea_plugin/build.gradle.kts                   | 18 +++++++-----------
 .../src/main/resources/META-INF/plugin.xml     |  3 +++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts
index c529963f5..354de0a71 100644
--- a/idea_plugin/build.gradle.kts
+++ b/idea_plugin/build.gradle.kts
@@ -20,10 +20,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 plugins {
   id("org.jetbrains.intellij.platform") version "2.10.2"
   // See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
-  // This version of Kotlin will crash if your Gradle daemon is running under Java 25 (even if that
-  // isn't the JDK you're using to compile). So make sure to update JAVA_HOME and then
-  // `./gradlew --stop`
-  kotlin("jvm") version "2.0.21"
+  kotlin("jvm") version "2.1.10"
 }
 
 repositories {
@@ -33,13 +30,11 @@ repositories {
 }
 
 // https://github.com/google/google-java-format/releases
-val googleJavaFormatVersion = "1.31.0"
+val googleJavaFormatVersion = "1.35.0"
 val pluginPatchVersion = "0"
 
 java {
-  toolchain {
-    languageVersion = JavaLanguageVersion.of(21)
-  }
+  toolchain { languageVersion = JavaLanguageVersion.of(21) }
   sourceCompatibility = JavaVersion.VERSION_21
   targetCompatibility = JavaVersion.VERSION_21
 }
@@ -51,7 +46,7 @@ intellijPlatform {
     name = "google-java-format"
     version = "${googleJavaFormatVersion}.${pluginPatchVersion}"
     ideaVersion {
-      sinceBuild = "242"
+      sinceBuild = "251"
       untilBuild = provider { null }
     }
   }
@@ -84,8 +79,9 @@ tasks { withType<Test>().configureEach { jvmArgs(gjfRequiredJvmArgs) } }
 
 dependencies {
   intellijPlatform {
-    intellijIdeaCommunity("2024.3")
+    intellijIdeaCommunity("2025.1")
     bundledPlugin("com.intellij.java")
+    testFramework(TestFrameworkType.Platform)
     testFramework(TestFrameworkType.Plugin.Java)
   }
   implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
@@ -93,5 +89,5 @@ dependencies {
   testImplementation("junit:junit:4.13.2")
   // https://mvnrepository.com/artifact/com.google.truth/truth
   testImplementation("com.google.truth:truth:1.4.5")
-  implementation(kotlin("stdlib-jdk8"))
+  implementation(kotlin("stdlib"))
 }
diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml
index 11d7d4877..ec3e3c3b2 100644
--- a/idea_plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea_plugin/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,9 @@
   ]]></description>
   <change-notes><![CDATA[
     <dl>
+      <dt>1.35.0.0</dt>
+      <dd>Updated to use google-java-format 1.35.0.</dd>
+      <dd>Minimum supported IntelliJ version is now 2025.1.</dd>
       <dt>1.31.0.0</dt>
       <dd>Updated to use google-java-format 1.31.0.</dd>
       <dt>1.30.0.1</dt>