Skip to content

Commit 681d7b0

Browse files
plumpygoogle-java-format Team
authored andcommitted
Update the IntelliJ plugin to gjf 1.35.0.
PiperOrigin-RevId: 883335043
1 parent 2f7e558 commit 681d7b0

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

idea_plugin/build.gradle.kts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
2020
plugins {
2121
id("org.jetbrains.intellij.platform") version "2.10.2"
2222
// See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
23-
// This version of Kotlin will crash if your Gradle daemon is running under Java 25 (even if that
24-
// isn't the JDK you're using to compile). So make sure to update JAVA_HOME and then
25-
// `./gradlew --stop`
26-
kotlin("jvm") version "2.0.21"
23+
kotlin("jvm") version "2.1.10"
2724
}
2825

2926
repositories {
@@ -33,13 +30,11 @@ repositories {
3330
}
3431

3532
// https://github.com/google/google-java-format/releases
36-
val googleJavaFormatVersion = "1.31.0"
33+
val googleJavaFormatVersion = "1.35.0"
3734
val pluginPatchVersion = "0"
3835

3936
java {
40-
toolchain {
41-
languageVersion = JavaLanguageVersion.of(21)
42-
}
37+
toolchain { languageVersion = JavaLanguageVersion.of(21) }
4338
sourceCompatibility = JavaVersion.VERSION_21
4439
targetCompatibility = JavaVersion.VERSION_21
4540
}
@@ -51,7 +46,7 @@ intellijPlatform {
5146
name = "google-java-format"
5247
version = "${googleJavaFormatVersion}.${pluginPatchVersion}"
5348
ideaVersion {
54-
sinceBuild = "242"
49+
sinceBuild = "251"
5550
untilBuild = provider { null }
5651
}
5752
}
@@ -84,14 +79,15 @@ tasks { withType<Test>().configureEach { jvmArgs(gjfRequiredJvmArgs) } }
8479

8580
dependencies {
8681
intellijPlatform {
87-
intellijIdeaCommunity("2024.3")
82+
intellijIdeaCommunity("2025.1")
8883
bundledPlugin("com.intellij.java")
84+
testFramework(TestFrameworkType.Platform)
8985
testFramework(TestFrameworkType.Plugin.Java)
9086
}
9187
implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
9288
// https://mvnrepository.com/artifact/junit/junit
9389
testImplementation("junit:junit:4.13.2")
9490
// https://mvnrepository.com/artifact/com.google.truth/truth
9591
testImplementation("com.google.truth:truth:1.4.5")
96-
implementation(kotlin("stdlib-jdk8"))
92+
implementation(kotlin("stdlib"))
9793
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
]]></description>
3636
<change-notes><![CDATA[
3737
<dl>
38+
<dt>1.35.0.0</dt>
39+
<dd>Updated to use google-java-format 1.35.0.</dd>
40+
<dd>Minimum supported IntelliJ version is now 2025.1.</dd>
3841
<dt>1.31.0.0</dt>
3942
<dd>Updated to use google-java-format 1.31.0.</dd>
4043
<dt>1.30.0.1</dt>

0 commit comments

Comments
 (0)