Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions idea_plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
plugins {
id("org.jetbrains.intellij.platform") version "2.10.2"
// See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
// This version of Kotlin will crash if your Gradle daemon is running under Java 25 (even if that
// isn't the JDK you're using to compile). So make sure to update JAVA_HOME and then
// `./gradlew --stop`
kotlin("jvm") version "2.0.21"
kotlin("jvm") version "2.1.10"
}

repositories {
Expand All @@ -33,13 +30,11 @@ repositories {
}

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

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
toolchain { languageVersion = JavaLanguageVersion.of(21) }
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
Expand All @@ -51,7 +46,7 @@ intellijPlatform {
name = "google-java-format"
version = "${googleJavaFormatVersion}.${pluginPatchVersion}"
ideaVersion {
sinceBuild = "242"
sinceBuild = "251"
untilBuild = provider { null }
}
}
Expand Down Expand Up @@ -84,14 +79,15 @@ tasks { withType<Test>().configureEach { jvmArgs(gjfRequiredJvmArgs) } }

dependencies {
intellijPlatform {
intellijIdeaCommunity("2024.3")
intellijIdeaCommunity("2025.1")
bundledPlugin("com.intellij.java")
testFramework(TestFrameworkType.Platform)
testFramework(TestFrameworkType.Plugin.Java)
}
implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
// https://mvnrepository.com/artifact/junit/junit
testImplementation("junit:junit:4.13.2")
// https://mvnrepository.com/artifact/com.google.truth/truth
testImplementation("com.google.truth:truth:1.4.5")
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
}
3 changes: 3 additions & 0 deletions idea_plugin/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
]]></description>
<change-notes><![CDATA[
<dl>
<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>
<dt>1.31.0.0</dt>
<dd>Updated to use google-java-format 1.31.0.</dd>
<dt>1.30.0.1</dt>
Expand Down
Loading