diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts index 354de0a71..9c8c3077b 100644 --- a/idea_plugin/build.gradle.kts +++ b/idea_plugin/build.gradle.kts @@ -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 { @@ -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 { @@ -52,7 +52,7 @@ intellijPlatform { } publishing { - val jetbrainsPluginRepoToken: String by project + val jetbrainsPluginRepoToken = project.providers.gradleProperty("jetbrainsPluginRepoToken") token.set(jetbrainsPluginRepoToken) } } diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml index ec3e3c3b2..cbea3444e 100644 --- a/idea_plugin/src/main/resources/META-INF/plugin.xml +++ b/idea_plugin/src/main/resources/META-INF/plugin.xml @@ -35,6 +35,8 @@ ]]> +
1.36.1.0
+
Updated to use google-java-format 1.36.1.
1.35.0.0
Updated to use google-java-format 1.35.0.
Minimum supported IntelliJ version is now 2025.1.
diff --git a/idea_plugin/src/test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java b/idea_plugin/src/test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java index fec086c68..bdf50a934 100644 --- a/idea_plugin/src/test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java +++ b/idea_plugin/src/test/java/com/google/googlejavaformat/intellij/GoogleJavaFormatFormattingServiceTest.java @@ -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; @@ -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();