Skip to content

Commit

Permalink
Intellij platform plugin 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
RedNesto committed Aug 1, 2024
1 parent e95da3e commit b3e691e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 22 deletions.
25 changes: 4 additions & 21 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ plugins {
mcdev
groovy
idea
id("org.jetbrains.intellij.platform") version "2.0.0-beta8"
id("org.jetbrains.intellij.platform") version "2.0.0"
id("org.cadixdev.licenser")
id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
id("org.jetbrains.changelog") version "2.2.0"
}

val ideaVersion: String by project
val ideaVersionNoEapSnapshot = ideaVersion.removeSuffix("-EAP-SNAPSHOT")
val ideaVersionProvider: Provider<String> = providers.gradleProperty("ideaVersion")
val ideaVersionName: String by project
val coreVersion: String by project

Expand Down Expand Up @@ -119,17 +118,6 @@ repositories {
}
}

configurations.all {
resolutionStrategy.eachDependency {
// For some reason dependency versions do not include the EAP-SNAPSHOT suffix anymore since beta7
// This works around the issue for now
// TODO remove when no longer needed
if (requested.version == ideaVersionNoEapSnapshot) {
useVersion(ideaVersion)
}
}
}

dependencies {
// Add tools.jar for the JDI API
implementation(files(Jvm.current().toolsJar))
Expand Down Expand Up @@ -161,7 +149,7 @@ dependencies {
grammarKit(libs.grammarKit)

intellijPlatform {
intellijIdeaCommunity(providers.gradleProperty("ideaVersion"))
intellijIdeaCommunity(ideaVersionProvider, useInstaller = false)
bundledPlugin("com.intellij.java.ide")
bundledPlugin("org.jetbrains.idea.maven")
bundledPlugin("com.intellij.gradle")
Expand All @@ -173,11 +161,6 @@ dependencies {
bundledPlugin("com.intellij.properties")
bundledPlugin("org.toml.lang")

// needed dependencies for unit tests
bundledPlugin("JUnit")

instrumentationTools()

testFramework(TestFrameworkType.JUnit5)
testFramework(TestFrameworkType.Plugin.Java)

Expand Down Expand Up @@ -249,7 +232,7 @@ intellijPlatform {
instrumentCode = false
buildSearchableOptions = false

verifyPlugin {
pluginVerification {
ides {
recommended()
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ideaVersion = 242.19890.14-EAP-SNAPSHOT
ideaVersionName = 2024.2

coreVersion = 1.8.0
downloadIdeaSources = true
org.jetbrains.intellij.platform.downloadSources=true

# Silences a build-time warning because we are bundling our own kotlin library
kotlin.stdlib.default.dependency = false

0 comments on commit b3e691e

Please sign in to comment.