Use gradle build directly for dev build (#8387)

This changes over to using gradle for writing the JX Browser key and setting the dev version number, which allows us to call `./gradlew build` for building the dev release instead of using the plugin tool. Note that the plugin tool is still being used to upload the dev build to jetbrains.

I think the next step is removing the gradle build command from the plugin tool and auditing the rest of the commands in the plugin tool to see if we can remove more. I ran a test of building dev from this branch, but I'll wait to make sure this works over the weekend before proceeding.

Author: helin24

.gitignore

@@ -48,6 +48,3 @@ lib/kotlin*
 /build/
 gradle-app.setting
 gradle/wrapper/gradle-wrapper.jar
-
-# User specific configuration based on current Intellij SDKs.
-gradle.properties

build.gradle.kts

@@ -12,6 +12,9 @@ import org.jetbrains.intellij.platform.gradle.models.ProductRelease
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import java.io.File
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 // Specify UTF-8 for all compilations so we avoid Windows-1252.
 allprojects {
@@ -39,7 +42,11 @@ plugins {
   id("org.jetbrains.kotlin.jvm") version "2.2.0" // Kotlin support
 }
 
-val flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
+var flutterPluginVersion = providers.gradleProperty("flutterPluginVersion").get()
+if (project.hasProperty("dev-version")) {
+  val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now())
+  flutterPluginVersion = project.property("dev-version").toString() + "-dev." + datestamp
+}
 val ideaVersion = providers.gradleProperty("ideaVersion").get()
 val dartPluginVersion = providers.gradleProperty("dartPluginVersion").get()
 val sinceBuildInput = providers.gradleProperty("sinceBuild").get()
@@ -267,3 +274,47 @@ tasks.register("printCompileClasspath") {
     println("--- End Compile Classpath ---")
   }
 }
+
+// This finds the JxBrowser license key from the environment and writes it to a file.
+// This is only used by the dev build on kokoro for now.
+val writeLicenseKey = tasks.register("writeLicenseKey") {
+  group = "build"
+  description = "Writes the license key from an environment variable to a file."
+
+  // Find the output file
+  val outputDir = rootProject.file("resources/jxbrowser")
+  val licenseFile = outputDir.resolve("jxbrowser.properties")
+  outputs.file(licenseFile)
+
+  doLast {
+    // Read the license key from the environment variable
+    val base = System.getenv("KOKORO_KEYSTORE_DIR")
+    val id = System.getenv("FLUTTER_KEYSTORE_ID")
+    val name = System.getenv("FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME")
+
+    val readFile = File(base + "/" + id + "_" + name)
+    if (readFile.isFile) {
+      val licenseKey = readFile.readText(Charsets.UTF_8)
+      licenseFile.writeText("jxbrowser.license.key=$licenseKey")
+    } else {
+      println("$readFile is not a file")
+    }
+  }
+}
+
+tasks.named("buildPlugin") {
+  dependsOn(writeLicenseKey)
+}
+
+tasks.named("processResources") {
+  dependsOn(writeLicenseKey)
+}
+
+// TODO(helin24): Find a better way to skip checking this file for tests.
+tasks.withType<ProcessResources>().configureEach {
+  if (name == "processTestResources") {
+    // This block will only execute for the 'processTestResources' task.
+    // The context here is unambiguously the task itself.
+    exclude("jxbrowser/jxbrowser.properties")
+  }
+}

gradle.properties

@@ -0,0 +1,17 @@
+#
+# Copyright 2025 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+
+# Change to version when releasing, e.g.
+#flutterPluginVersion=87.0.1
+flutterPluginVersion=SNAPSHOT
+ideaVersion=2024.3.1.7
+dartPluginVersion= 243.21565.120
+sinceBuild=243
+untilBuild=253.*
+javaVersion=21
+kotlin.stdlib.default.dependency=false
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xms1024m -Xmx4048m

tool/kokoro/build.sh

@@ -5,6 +5,6 @@ setup
 
 echo "kokoro build start"
 
-./bin/plugin make --channel=dev
+./third_party/gradlew buildPlugin
 
 echo "kokoro build finished"

tool/kokoro/deploy.sh

@@ -5,7 +5,7 @@ setup
 
 echo "kokoro build start"
 
-./bin/plugin make --channel=dev
+./third_party/gradlew buildPlugin -Pdev-version=88.0
 
 echo "kokoro build finished"
 

tool/plugin/lib/plugin.dart

@@ -418,34 +418,29 @@ class DeployCommand extends ProductCommand {
 
   @override
   Future<int> doit() async {
-    if (isReleaseMode) {
-      if (!await performReleaseChecks(this)) {
-        return 1;
-      }
-    } else if (!isDevChannel) {
-      log('Deploy must have a --release or --channel=dev argument');
+    if (!isDevChannel) {
+      log('Deploy must have --channel=dev argument');
       return 1;
     }
 
     var token = readTokenFromKeystore('FLUTTER_KEYSTORE_NAME');
     var value = 0;
     var originalDir = Directory.current;
-    for (var spec in specs) {
-      if (spec.channel != channel) continue;
-      var filePath = releasesFilePath(spec);
-      log("uploading $filePath");
-      var file = File(filePath);
-      changeDirectory(file.parent);
-      var pluginNumber = pluginRegistryIds[spec.pluginId];
-      value = await upload(
-        p.basename(file.path),
-        pluginNumber!,
-        token,
-        spec.channel,
-      );
-      if (value != 0) {
-        return value;
-      }
+    var filePath = p.join(
+      rootPath,
+      'build/distributions/flutter-intellij-kokoro.zip',
+    );
+    log("uploading $filePath");
+    var file = File(filePath);
+    changeDirectory(file.parent);
+    value = await upload(
+      p.basename(file.path),
+      '9212', // plugin registry ID for io.flutter
+      token,
+      'dev',
+    );
+    if (value != 0) {
+      return value;
     }
     changeDirectory(originalDir);
     return value;

tool/plugin/test/plugin_test.dart

@@ -162,16 +162,6 @@ void main() {
       });
       expect(cmd.paths, orderedEquals([]));
     });
-
-    test('release paths', () async {
-      var runner = makeTestRunner();
-      late TestDeployCommand cmd;
-      await runner.run(["--release=19", "-d../..", "deploy"]).whenComplete(() {
-        cmd = (runner.commands['deploy'] as TestDeployCommand);
-      });
-      var specs = cmd.specs.where((s) => s.isStableChannel).toList();
-      expect(cmd.paths.length, specs.length);
-    });
   });
 
   group('build', () {