diff options
author | Liam Miller-Cushon <cushon@google.com> | 2023-09-07 08:57:02 -0700 |
---|---|---|
committer | google-java-format Team <google-java-format-dev+copybara@google.com> | 2023-09-07 08:57:45 -0700 |
commit | d0e44e5d6120dfab4f4833dc4331986d726a2ce1 (patch) | |
tree | d715842469ca51b916909bea12f0d2f222c430de | |
parent | 915b78fb245aba6fa8236c2e8c928f5d91a73295 (diff) | |
download | google-java-format-d0e44e5d6120dfab4f4833dc4331986d726a2ce1.tar.gz |
Follow-up to https://github.com/google/google-java-format/commit/9f2cd6827d016a3b55b7f9f39e054a69b0deb168
Use `com.google.common.base.Supplier`, for compatibility with clients
that are using the Android version of Guava. Fixes e.g.
```
Exception in thread "main" java.lang.IncompatibleClassChangeError: Class com.google.common.base.Suppliers$NonSerializableMemoizingSupplier does not implement the requested interface java.util.function.Supplier
```
PiperOrigin-RevId: 563446857
-rw-r--r-- | core/src/main/java/com/google/googlejavaformat/Doc.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/java/com/google/googlejavaformat/Doc.java b/core/src/main/java/com/google/googlejavaformat/Doc.java index e755bc6..cab6885 100644 --- a/core/src/main/java/com/google/googlejavaformat/Doc.java +++ b/core/src/main/java/com/google/googlejavaformat/Doc.java @@ -19,6 +19,7 @@ import static com.google.googlejavaformat.CommentsHelper.reformatParameterCommen import static java.lang.Math.max; import com.google.common.base.MoreObjects; +import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.DiscreteDomain; import com.google.common.collect.Iterators; @@ -27,7 +28,6 @@ import com.google.googlejavaformat.Output.BreakTag; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.function.Supplier; /** * {@link com.google.googlejavaformat.java.JavaInputAstVisitor JavaInputAstVisitor} outputs a |