@@ -15,7 +15,6 @@ fun extra(key: String): String = project.ext.get(key) as String
1515val javaVersion = properties(" javaVersion" )
1616val platformBundledPlugins = providers.gradleProperty(" platformBundledPlugins" )
1717val platformPlugins = providers.gradleProperty(" platformPlugins" )
18- val platformType = properties(" platformType" )
1918val platformVersion = properties(" platformVersion" )
2019val pluginGroup = properties(" pluginGroup" )
2120val pluginName = properties(" pluginName" )
@@ -60,12 +59,7 @@ dependencies {
6059 intellijPlatform {
6160 val isSnapshot = platformVersion.endsWith(" -SNAPSHOT" )
6261 create(
63- // Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
64- // IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
65- // 2025.3.* RELEASE. See below commit & method impl for details:
66- // - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
67- // - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
68- type = IntelliJPlatformType .fromCode(platformType, platformVersion),
62+ type = IntelliJPlatformType .IntellijIdea ,
6963 version = platformVersion,
7064 ) {
7165 // `useInstaller` needs to be set to 'false' (aka, `isSnapshot` = 'true') to resolve EAP releases.
@@ -224,14 +218,9 @@ intellijPlatform {
224218 logger.debug(" Using ${failureLevels.size} Failure Levels: $failureLevels " )
225219 failureLevel.set(failureLevels)
226220 ides {
227- logger.lifecycle(" Verifying against IntelliJ Platform $platformType $platformVersion " )
221+ logger.lifecycle(" Verifying against IntelliJ $platformVersion " )
228222 create(
229- // Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
230- // IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
231- // 2025.3.* RELEASE. See below commit & method impl for details:
232- // - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
233- // - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
234- type = IntelliJPlatformType .fromCode(platformType, platformVersion),
223+ type = IntelliJPlatformType .IntellijIdea ,
235224 version = platformVersion,
236225 ) {
237226 useCache = true
@@ -255,10 +244,7 @@ tasks {
255244 }
256245
257246 printProductsReleases {
258- // // In addition to `IC` (from `platformType`), we also want to verify against `IU`.
259- // types.set(Arrays.asList(platformType, "IU"))
260- // Contrary to above, we want to speed up CI, so skip verification of `IU`.
261- types = listOf (IntelliJPlatformType .fromCode(platformType))
247+ types = listOf (IntelliJPlatformType .IntellijIdea )
262248
263249 // Only get the released versions if we are not targeting an EAP.
264250 val isEAP = pluginVersion.uppercase().endsWith(" -EAP" )
@@ -280,30 +266,13 @@ tasks {
280266 }
281267 }
282268
283- // In "IntelliJ Platform Gradle Plugin 2.*", the `listProductsReleases` task no longer exists, but
284- // instead the `printProductReleases` task does. This task is necessary to take the output of
285- // `printProductReleases` and write it to a file for use in the `generateIdeVersionsList` task below.
286- val listProductReleasesTaskName = " listProductsReleases"
287- register(listProductReleasesTaskName) {
288- dependsOn(printProductsReleases)
289- val outputF = layout.buildDirectory.file(" listProductsReleases.txt" ).also {
290- outputs.file(it)
291- }
292- val content = printProductsReleases.flatMap { it.productsReleases }.map { it.joinToString(" \n " ) }
293-
294- doLast {
295- outputF.orNull?.asFile?.writeText(content.get())
296- }
297- }
298-
299269 // Task to generate the necessary format for `ChrisCarini/intellij-platform-plugin-verifier-action` GitHub Action.
300270 register<DefaultTask >(" generateIdeVersionsList" ) {
301- dependsOn(project.tasks.named(listProductReleasesTaskName))
302271 doLast {
303272 val ideVersionsList = mutableListOf<String >()
304273
305- // Include the versions produced from the `listProductsReleases ` task.
306- project.tasks.named(listProductReleasesTaskName) .get().outputs.files.singleFile.forEachLine { line ->
274+ // Include the versions produced from the `printProductsReleases ` task.
275+ printProductsReleases.flatMap { it.productsReleases }.map { it.joinToString( " \n " ) } .get().split( " \n " ).forEach { line ->
307276 ideVersionsList.add(" idea" + line.replace(" -" , " :" ))
308277 }
309278
@@ -315,11 +284,7 @@ tasks {
315284 return @forEach
316285 }
317286
318- // Note: Used to test against both IC & IU, but now defaulting to just whatever is specified
319- // by `platformType` in the `gradle.properties` file.
320- listOf (platformType).forEach { type ->
321- ideVersionsList.add(" idea$type :$version " )
322- }
287+ ideVersionsList.add(" ideaIU:$version " )
323288 }
324289
325290 // Write out file with unique pairs of type + version
0 commit comments