Skip to content

Commit 365b31f

Browse files
plumpygoogle-java-format Team
authored andcommitted
Update the IntelliJ plugin to use google-java-format 1.36.1.
PiperOrigin-RevId: 958351028
1 parent b81163d commit 365b31f

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎idea_plugin/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
1818

1919
// https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
2020
plugins {
21-
id("org.jetbrains.intellij.platform") version "2.10.2"
21+
id("org.jetbrains.intellij.platform") version "2.18.1"
2222
// See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
23-
kotlin("jvm") version "2.1.10"
23+
kotlin("jvm") version "2.4.10"
2424
}
2525

2626
repositories {
@@ -30,7 +30,7 @@ repositories {
3030
}
3131

3232
// https://github.com/google/google-java-format/releases
33-
val googleJavaFormatVersion = "1.35.0"
33+
val googleJavaFormatVersion = "1.36.1"
3434
val pluginPatchVersion = "0"
3535

3636
java {
@@ -52,7 +52,7 @@ intellijPlatform {
5252
}
5353

5454
publishing {
55-
val jetbrainsPluginRepoToken: String by project
55+
val jetbrainsPluginRepoToken = project.providers.gradleProperty("jetbrainsPluginRepoToken")
5656
token.set(jetbrainsPluginRepoToken)
5757
}
5858
}

‎idea_plugin/src/main/resources/META-INF/plugin.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
]]></description>
3636
<change-notes><![CDATA[
3737
<dl>
38+
<dt>1.36.1.0</dt>
39+
<dd>Updated to use google-java-format 1.36.1.</dd>
3840
<dt>1.35.0.0</dt>
3941
<dd>Updated to use google-java-format 1.35.0.</dd>
4042
<dd>Minimum supported IntelliJ version is now 2025.1.</dd>

‎idea_plugin/src/test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
import com.intellij.formatting.service.AsyncFormattingRequest;
2727
import com.intellij.formatting.service.FormattingService;
2828
import com.intellij.formatting.service.FormattingServiceUtil;
29+
import com.intellij.openapi.application.PathManager;
2930
import com.intellij.openapi.command.WriteCommandAction;
3031
import com.intellij.openapi.vfs.VirtualFile;
32+
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
3133
import com.intellij.psi.PsiElement;
3234
import com.intellij.psi.PsiFile;
3335
import com.intellij.psi.codeStyle.CodeStyleManager;
@@ -54,6 +56,7 @@ public void setUp() throws Exception {
5456
fixture =
5557
JavaTestFixtureFactory.getFixtureFactory()
5658
.createCodeInsightFixture(projectBuilder.getFixture());
59+
VfsRootAccess.allowRootAccess(fixture.getProjectDisposable(), PathManager.getPluginsPath());
5760
fixture.setUp();
5861

5962
delegatingFormatter = new DelegatingFormatter();

0 commit comments

Comments
 (0)