Sync with master

kuzyanov · Apr 19, 2021 · 7e2ec1d · 7e2ec1d
1 parent c14b5ac
commit 7e2ec1d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.googlejavaformat</groupId>
     <artifactId>google-java-format-parent</artifactId>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>google-java-format</artifactId>

diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -132,7 +132,8 @@ public void format() {
     try {
       Formatter formatter = new Formatter();
       String output = formatter.formatSource(input);
-      output = StringWrapper.wrap(output, formatter);
+      JavaFormatterOptions options = JavaFormatterOptions.builder().build();
+      output = StringWrapper.wrap(output, formatter, options);
       assertEquals("bad output for " + name, expected, output);
     } catch (FormatterException e) {
       fail(String.format("Formatter crashed on %s: %s", name, e.getMessage()));

diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java
@@ -28,6 +28,7 @@
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.Rule;

diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 ext {
-  googleJavaFormatVersion = '1.10.0'
+  googleJavaFormatVersion = '1.10.0-SNAPSHOT'
 }
 
 apply plugin: 'org.jetbrains.intellij'

diff --git a/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java b/idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatConfigurable.java
@@ -33,7 +33,6 @@
 import javax.swing.JPanel;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import java.text.NumberFormat;
-import javax.annotation.Nullable;
 import javax.swing.*;
 
 import org.jetbrains.annotations.Nls;

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format-parent</artifactId>
   <packaging>pom</packaging>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.10.0-SNAPSHOT</version>
 
   <modules>
     <module>core</module>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ repositories { @@
     }
     ext {
-      googleJavaFormatVersion = '1.10.0'
+      googleJavaFormatVersion = '1.10.0-SNAPSHOT'
     }
     apply plugin: 'org.jetbrains.intellij'
@@ Expand Down @@