From 74c510a03f218bdae157ebf06f030afd98eafc39 Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Tue, 27 Feb 2024 10:40:25 -0800
Subject: [PATCH] Update the IntelliJ plugin to gfj 1.20.0.

PiperOrigin-RevId: 610801461
---
 idea_plugin/build.gradle.kts                                | 6 +++---
 .../intellij/GoogleJavaFormatConfigurable.java              | 2 +-
 .../googlejavaformat/intellij/GoogleJavaFormatSettings.java | 2 +-
 idea_plugin/src/main/resources/META-INF/plugin.xml          | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts
index 2247893c1..0c3ae944e 100644
--- a/idea_plugin/build.gradle.kts
+++ b/idea_plugin/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("org.jetbrains.intellij") version "1.16.1" }
+plugins { id("org.jetbrains.intellij") version "1.17.2" }
 
 apply(plugin = "org.jetbrains.intellij")
 
@@ -22,7 +22,7 @@ apply(plugin = "java")
 
 repositories { mavenCentral() }
 
-val googleJavaFormatVersion = "1.19.2"
+val googleJavaFormatVersion = "1.20.0"
 
 java {
   sourceCompatibility = JavaVersion.VERSION_11
@@ -62,5 +62,5 @@ tasks {
 dependencies {
   implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
   testImplementation("junit:junit:4.13.2")
-  testImplementation("com.google.truth:truth:1.2.0")
+  testImplementation("com.google.truth:truth:1.4.1")
 }
diff --git a/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java b/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java
index cbb0ee10b..759decc0f 100644
--- a/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java
+++ b/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java
@@ -33,7 +33,7 @@
 import javax.swing.JPanel;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
-import org.jspecify.annotations.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 class GoogleJavaFormatConfigurable extends BaseConfigurable implements SearchableConfigurable {
 
diff --git a/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java b/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java
index 572d9ba6d..4546f68a3 100644
--- a/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java
+++ b/idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatSettings.java
@@ -22,7 +22,7 @@
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
-import org.jspecify.annotations.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @State(
     name = "GoogleJavaFormatSettings",
diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml
index a5600b00d..c426a1ff1 100644
--- a/idea_plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea_plugin/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,8 @@
   ]]></description>
   <change-notes><![CDATA[
     <dl>
+      <dt>1.20.0.0</dt>
+      <dd>Updated to use google-java-format 1.20.0.</dd>
       <dt>1.19.2.0</dt>
       <dd>Updated to use google-java-format 1.19.2.</dd>
       <dt>1.17.0.0</dt>