Skip to content

Update the IntelliJ plugin to use google-java-format 1.36.1. #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 3, 2026
+9 −4
Merged

Update the IntelliJ plugin to use google-java-format 1.36.1. #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions idea_plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType

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

repositories {
Expand All @@ -30,7 +30,7 @@ repositories {
}

// https://github.com/google/google-java-format/releases
val googleJavaFormatVersion = "1.35.0"
val googleJavaFormatVersion = "1.36.1"
val pluginPatchVersion = "0"

java {
Expand All @@ -52,7 +52,7 @@ intellijPlatform {
}

publishing {
val jetbrainsPluginRepoToken: String by project
val jetbrainsPluginRepoToken = project.providers.gradleProperty("jetbrainsPluginRepoToken")
token.set(jetbrainsPluginRepoToken)
}
}
Expand Down
2 changes: 2 additions & 0 deletions idea_plugin/src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
]]></description>
<change-notes><![CDATA[
<dl>
<dt>1.36.1.0</dt>
<dd>Updated to use google-java-format 1.36.1.</dd>
<dt>1.35.0.0</dt>
<dd>Updated to use google-java-format 1.35.0.</dd>
<dd>Minimum supported IntelliJ version is now 2025.1.</dd>
Expand Down
3 changes: 3 additions & 0 deletions ...test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import com.intellij.formatting.service.AsyncFormattingRequest;
import com.intellij.formatting.service.FormattingService;
import com.intellij.formatting.service.FormattingServiceUtil;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleManager;
Expand All @@ -54,6 +56,7 @@ public void setUp() throws Exception {
fixture =
JavaTestFixtureFactory.getFixtureFactory()
.createCodeInsightFixture(projectBuilder.getFixture());
VfsRootAccess.allowRootAccess(fixture.getProjectDisposable(), PathManager.getPluginsPath());
fixture.setUp();

delegatingFormatter = new DelegatingFormatter();
Expand Down