Skip to content

Commit 53f216c

Browse files
committed
Update to use 1.13.0
1 parent b28cc9a commit 53f216c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

idea_plugin/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616

1717
plugins {
18-
id "org.jetbrains.intellij" version "1.3.0"
18+
id "org.jetbrains.intellij" version "1.3.1"
1919
}
2020

2121
repositories {
2222
mavenCentral()
2323
}
2424

2525
ext {
26-
googleJavaFormatVersion = '1.13.0'
26+
googleJavaFormatVersion = "1.13.0"
2727
}
2828

2929
apply plugin: "org.jetbrains.intellij"
@@ -35,7 +35,7 @@ targetCompatibility = JavaVersion.VERSION_11
3535
intellij {
3636
pluginName = "google-java-format"
3737
plugins = ["java"]
38-
version = "2020.3"
38+
version = "221.3427-EAP-CANDIDATE-SNAPSHOT"
3939
}
4040

4141
patchPluginXml {

idea_plugin/src/com/google/googlejavaformat/intellij/CodeStyleManagerDecorator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void reformatText(@NotNull PsiFile file, int startOffset, int endOffset)
9191
}
9292

9393
@Override
94-
public void reformatText(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
94+
public void reformatText(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
9595
throws IncorrectOperationException {
9696
delegate.reformatText(file, ranges);
9797
}
@@ -104,7 +104,7 @@ public void reformatTextWithContext(
104104
}
105105

106106
@Override
107-
public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
107+
public void reformatTextWithContext(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
108108
throws IncorrectOperationException {
109109
delegate.reformatTextWithContext(file, ranges);
110110
}

idea_plugin/src/com/google/googlejavaformat/intellij/GoogleJavaFormatCodeStyleManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void reformatText(@NotNull PsiFile file, int startOffset, int endOffset)
6363
}
6464

6565
@Override
66-
public void reformatText(@NotNull PsiFile file, @NotNull Collection<TextRange> ranges)
66+
public void reformatText(@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges)
6767
throws IncorrectOperationException {
6868
if (overrideFormatterForFile(file)) {
6969
formatInternal(file, ranges);
@@ -85,7 +85,7 @@ public void reformatTextWithContext(@NotNull PsiFile file, @NotNull ChangedRange
8585

8686
@Override
8787
public void reformatTextWithContext(
88-
@NotNull PsiFile file, @NotNull Collection<TextRange> ranges) {
88+
@NotNull PsiFile file, @NotNull Collection<? extends TextRange> ranges) {
8989
if (overrideFormatterForFile(file)) {
9090
formatInternal(file, ranges);
9191
} else {

0 commit comments

Comments
 (0)