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
56 changes: 24 additions & 32 deletions idea_plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,28 @@
import org.jetbrains.intellij.platform.gradle.TestFrameworkType

// https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
plugins {
id("org.jetbrains.intellij.platform") version "2.6.0"
}
plugins { id("org.jetbrains.intellij.platform") version "2.9.0" }

repositories {
mavenCentral()

intellijPlatform {
defaultRepositories()
}
intellijPlatform { defaultRepositories() }
}

// https://github.com/google/google-java-format/releases
val googleJavaFormatVersion = "1.28.0"
val googleJavaFormatVersion = "1.29.0"

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

intellijPlatform {
pluginConfiguration {
name = "google-java-format"
version = "${googleJavaFormatVersion}.0"
ideaVersion {
sinceBuild = "223"
sinceBuild = "243"
untilBuild = provider { null }
}
}
Expand All @@ -54,38 +50,34 @@ intellijPlatform {
}

var gjfRequiredJvmArgs =
listOf(
"--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
)
listOf(
"--add-exports",
"jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports",
"jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
)

tasks {
runIde {
jvmArgumentProviders += CommandLineArgumentProvider {
gjfRequiredJvmArgs
}
}
}
tasks { runIde { jvmArgumentProviders += CommandLineArgumentProvider { gjfRequiredJvmArgs } } }

tasks {
withType<Test>().configureEach {
jvmArgs(gjfRequiredJvmArgs)
}
}
tasks { withType<Test>().configureEach { jvmArgs(gjfRequiredJvmArgs) } }

dependencies {
intellijPlatform {
intellijIdeaCommunity("2022.3")
intellijIdeaCommunity("2024.3")
bundledPlugin("com.intellij.java")
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.4")
testImplementation("com.google.truth:truth:1.4.5")
}
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.29.0.0</dt>
<dd>Updated to use google-java-format 1.29.0.</dd>
<dd>Minimum supported IntelliJ version is now 2024.3.</dd>
<dt>1.28.0.0</dt>
<dd>Updated to use google-java-format 1.28.0.</dd>
<dt>1.27.0.0</dt>
Expand Down