changes required to release on IntelliJ 2025.1

flutter · Mar 7, 2025 · 18e5530 · 18e5530
1 parent 9a72135
commit 18e5530
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,6 +37,7 @@ plugins {
   id("org.jetbrains.kotlin.jvm") version "2.1.0"
 }
 
+// TODO(mossmana) These properties are duplicated in flutter-idea/build.gradle.kts and flutter-studio/build.gradle.kts. Should be consolidated.
 val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
 val ideaProduct = providers.gradleProperty("ideaProduct").get()
 val ideaVersion = providers.gradleProperty("ideaVersion").get()
@@ -45,6 +46,7 @@ val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
 val untilBuildInput = providers.gradleProperty("untilBuild").get()
+val javaVersion = providers.gradleProperty("javaVersion").get()
 group = "io.flutter"
 
 // For debugging purposes:
@@ -55,28 +57,37 @@ println("dartPluginVersion: $dartPluginVersion")
 println("androidPluginVersion: $androidPluginVersion")
 println("sinceBuild: $sinceBuildInput")
 println("untilBuild: $untilBuildInput")
+println("javaVersion: $javaVersion")
 println("group: $group")
 
+var jvmVersion = JvmTarget.JVM_17
+if (javaVersion == "21") {
+  jvmVersion = JvmTarget.JVM_21
+}
 kotlin {
   compilerOptions {
     apiVersion.set(KotlinVersion.KOTLIN_1_9)
-    jvmTarget = JvmTarget.JVM_17
+    jvmTarget = jvmVersion
   }
 }
-val javaCompatibilityVersion = JavaVersion.VERSION_17
+
+var javaCompatibilityVersion = JavaVersion.VERSION_17
+if (javaVersion == "21") {
+  javaCompatibilityVersion = JavaVersion.VERSION_21
+}
 java {
   sourceCompatibility = javaCompatibilityVersion
   targetCompatibility = javaCompatibilityVersion
 }
 
 dependencies {
   intellijPlatform {
-    // Documentation on the create(...) methods:
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#custom-target-platforms
+    // Documentation on the default target platform methods:
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     if (ideaProduct == "android-studio") {
-      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
-    } else {//if (ide == "ideaIC") {
-      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+      androidStudio(ideaVersion)
+    } else { // if (ideaProduct == "IC") {
+      intellijIdeaCommunity(ideaVersion)
     }
     testFramework(TestFrameworkType.Platform)
 

diff --git a/flutter-idea/build.gradle.kts b/flutter-idea/build.gradle.kts
@@ -35,28 +35,38 @@ val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
 val untilBuildInput = providers.gradleProperty("untilBuild").get()
+val javaVersion = providers.gradleProperty("javaVersion").get()
 group = "io.flutter"
 
+var jvmVersion = JvmTarget.JVM_17
+if (javaVersion == "21") {
+  jvmVersion = JvmTarget.JVM_21
+}
 kotlin {
   compilerOptions {
     apiVersion.set(KotlinVersion.KOTLIN_1_9)
-    jvmTarget = JvmTarget.JVM_17
+    jvmTarget = jvmVersion
   }
 }
-val javaCompatibilityVersion = JavaVersion.VERSION_17
+
+var javaCompatibilityVersion = JavaVersion.VERSION_17
+if (javaVersion == "21") {
+  javaCompatibilityVersion = JavaVersion.VERSION_21
+}
 java {
   sourceCompatibility = javaCompatibilityVersion
   targetCompatibility = javaCompatibilityVersion
 }
 
+
 dependencies {
   intellijPlatform {
-    // Documentation on the create(...) methods:
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#custom-target-platforms
+    // Documentation on the default target platform methods:
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     if (ideaProduct == "android-studio") {
-      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
+      androidStudio(ideaVersion)
     } else { // if (ideaProduct == "IC") {
-      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+      intellijIdeaCommunity(ideaVersion)
     }
     testFramework(TestFrameworkType.Platform)
 

diff --git a/flutter-studio/build.gradle.kts b/flutter-studio/build.gradle.kts
@@ -36,28 +36,42 @@ val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val androidPluginVersion = providers.gradleProperty("androidPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
 val untilBuildInput = providers.gradleProperty("untilBuild").get()
+val javaVersion = providers.gradleProperty("javaVersion").get()
 group = "io.flutter"
 
+var jvmVersion = JvmTarget.JVM_17
+if (javaVersion == "21") {
+  jvmVersion = JvmTarget.JVM_21
+}
 kotlin {
   compilerOptions {
     apiVersion.set(KotlinVersion.KOTLIN_1_9)
-    jvmTarget = JvmTarget.JVM_17
+    jvmTarget = jvmVersion
   }
 }
-val javaCompatibilityVersion = JavaVersion.VERSION_17
+
+var javaCompatibilityVersion = JavaVersion.VERSION_17
+if (javaVersion == "21") {
+  javaCompatibilityVersion = JavaVersion.VERSION_21
+}
 java {
   sourceCompatibility = javaCompatibilityVersion
   targetCompatibility = javaCompatibilityVersion
 }
 
 dependencies {
   intellijPlatform {
+    // Documentation on the default target platform methods:
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     if (ideaProduct == "android-studio") {
-      create(IntelliJPlatformType.AndroidStudio, ideaVersion)
+      androidStudio(ideaVersion)
     } else { // if (ideaProduct == "IC") {
-      create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+      intellijIdeaCommunity(ideaVersion)
     }
     testFramework(TestFrameworkType.Platform)
+
+    // Plugin dependnecy documentation:
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#plugins
     val bundledPluginList = mutableListOf(
       "com.intellij.java",
       "com.intellij.properties",

diff --git a/product-matrix.json b/product-matrix.json
@@ -13,7 +13,8 @@
       "androidPluginVersion": "",
       "sinceBuild": "233",
       "untilBuild": "233.*",
-      "isUnitTestTarget": "false"
+      "isUnitTestTarget": "false",
+      "javaVersion": "17"
     },
     {
       "channel": "stable",
@@ -28,7 +29,8 @@
       "androidPluginVersion": "",
       "sinceBuild": "241",
       "untilBuild": "241.*",
-      "isUnitTestTarget": "false"
+      "isUnitTestTarget": "false",
+      "javaVersion": "17"
     },
     {
       "channel": "stable",
@@ -43,7 +45,8 @@
       "androidPluginVersion": "",
       "sinceBuild": "242",
       "untilBuild": "242.*",
-      "isUnitTestTarget": "false"
+      "isUnitTestTarget": "false",
+      "javaVersion": "17"
     },
     {
       "channel": "stable",
@@ -54,11 +57,28 @@
       "ideaProduct": "android-studio",
       "ideaVersion": "2024.3.1.10",
       "baseVersion": "243.22562.59",
-      "dartPluginVersion": " 243.21565.120",
+      "dartPluginVersion": "243.21565.120",
       "androidPluginVersion": "",
       "sinceBuild": "243",
       "untilBuild": "253.*",
-      "isUnitTestTarget": "true"
+      "isUnitTestTarget": "true",
+      "javaVersion": "17"
+    },
+    {
+      "channel": "stable",
+      "comments": "IntelliJ 2025.1 Beta, Android Studio Meerkat 2024.3 EAP",
+      "name": "2025.1",
+      "version": "2025.1",
+      "ijVersion": "2025.1",
+      "ideaProduct": "IC",
+      "ideaVersion": "251.23774.16",
+      "baseVersion": "251.23774.16",
+      "dartPluginVersion": "251.23774.16",
+      "androidPluginVersion": "251.23774.16",
+      "sinceBuild": "243",
+      "untilBuild": "253.*",
+      "isUnitTestTarget": "true",
+      "javaVersion": "21"
     }
   ]
 }
diff --git a/tool/plugin/lib/build_spec.dart b/tool/plugin/lib/build_spec.dart
@@ -23,6 +23,7 @@ class BuildSpec {
   final String ideaVersion;
   final String androidPluginVersion;
   final String dartPluginVersion;
+  final String javaVersion;
 
   // TODO (jwren) can baseVersion be removed?
   final String baseVersion;
@@ -50,7 +51,8 @@ class BuildSpec {
       untilBuild = json['untilBuild'] as String,
       filesToSkip = json['filesToSkip'] as List<String>? ?? [],
       isUnitTestTarget = json['isUnitTestTarget'] == 'true',
-      isTestTarget = json['isTestTarget'] == 'true';
+      isTestTarget = json['isTestTarget'] == 'true',
+      javaVersion = json['javaVersion'] as String;
 
   bool get copyIjVersion => isAndroidStudio && ijVersion != null;
 
@@ -106,6 +108,7 @@ class BuildSpec {
         'ideaVersion: $ideaVersion, '
         'baseVersion: $baseVersion, '
         'dartPluginVersion: $dartPluginVersion, '
+        'javaVersion: $javaVersion, '
         'since: $sinceBuild, '
         'until: $untilBuild, '
         'version: "$release")';

diff --git a/tool/plugin/lib/runner.dart b/tool/plugin/lib/runner.dart
@@ -73,6 +73,7 @@ androidPluginVersion=${spec.androidPluginVersion}
 sinceBuild=${spec.sinceBuild}
 untilBuild=${spec.untilBuild}
 testing=$testing
+javaVersion=${spec.javaVersion}
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xms1024m -Xmx4048m