Add idea 2026.1 to GitHub workflow and bump minimum supported version to 2025.1 (#260)

hduelme · web-flow · commit 00e247fc454f · 2026-05-02T16:30:19.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,11 +8,10 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - { jdk: 21, idea: 2024.2 }
-          - { jdk: 21, idea: 2024.3 }
           - { jdk: 21, idea: 2025.1 }
           - { jdk: 21, idea: 2025.2 }
           - { jdk: 21, idea: 2025.3 }
+          - { jdk: 21, idea: 2026.1 }
           - { jdk: 21, idea: LATEST-EAP-SNAPSHOT }
     name: 'IDEA ${{ matrix.version.idea }}'
     env:
@@ -33,7 +32,7 @@ jobs:
       - name: 'Generate coverage report'
         run: ./gradlew --warning-mode=all jacocoTestReport
       - name: 'Upload coverage to Codecov'
-        if: github.repository == 'mapstruct/mapstruct-idea' &&  matrix.version.idea  == '2024.2'
+        if: github.repository == 'mapstruct/mapstruct-idea' &&  matrix.version.idea  == '2025.1'
         uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,8 @@ import com.hierynomus.gradle.license.tasks.LicenseFormat
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
-    id("org.jetbrains.intellij.platform") version "2.10.5"
+    id('java')
+    id("org.jetbrains.intellij.platform") version "2.15.0"
     id("com.github.hierynomus.license") version "0.16.1"
 }
 
@@ -36,7 +37,7 @@ intellijPlatform {
     projectName = 'MapStruct-Intellij-Plugin'
     pluginConfiguration {
         ideaVersion {
-            sinceBuild = "242"
+            sinceBuild = "251"
             untilBuild = provider { null } as Provider<? extends String>
         }
     }
@@ -95,21 +96,15 @@ def versionToUse = System.getenv().getOrDefault( 'IDEA_VERSION', ideaVersion )
 def useIdeaInstaller = !versionToUse.containsIgnoreCase( "EAP" )
 dependencies {
     intellijPlatform {
-        // When versionToUse is 2025.3 or later then there is only a single distribution of IntelliJ
-        // This comparison can be removed if the oldest supported version of idea is 2025.3 (253) or later
-        if (('2025.3' <=> versionToUse) <= 0 ){
-            intellijIdea(versionToUse) {
-                useInstaller = useIdeaInstaller
-            }
-        } else {
-            ideaType == 'IC' ? intellijIdeaCommunity(versionToUse, useIdeaInstaller) : intellijIdeaUltimate(versionToUse, useIdeaInstaller)
+        intellijIdea(versionToUse) {
+            useInstaller = useIdeaInstaller
         }
 
         bundledPlugin( 'com.intellij.java' )
         bundledPlugin( 'org.jetbrains.kotlin' )
 
         testFramework( TestFrameworkType.Platform.INSTANCE )
-        testFramework( TestFrameworkType.Bundled.INSTANCE )
+        testFramework( TestFrameworkType.Plugin.Java.INSTANCE )
     }
     implementation('org.mapstruct:mapstruct:1.5.3.Final')
     testImplementation(platform('org.junit:junit-bom:5.11.0'))
diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,7 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 
-ideaVersion = 2024.2
-ideaType = IC
+ideaVersion = 2025.1
 sources = true
 runGenerators = true
 org.gradle.jvmargs=-Xmx1024m
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -24,7 +24,7 @@
   <vendor url="https://www.mapstruct.org">MapStruct</vendor>
 
   <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-  <idea-version since-build="242"/>
+  <idea-version since-build="251"/>
 
   <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->
