Merge pull request #32668 from grossws/gradle-plugins-update-build

Update Gradle plugins build

devtools/gradle/build-logic/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation(plugin("com.gradle.plugin-publish", "1.2.0"))
+}
+
+fun DependencyHandler.plugin(id: String, version: String) =
+    create("$id:$id.gradle.plugin:$version")

devtools/gradle/build-logic/settings.gradle.kts

@@ -0,0 +1,13 @@
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

devtools/gradle/build-logic/src/main/kotlin/io.quarkus.devtools.gradle-plugin.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("io.quarkus.devtools.java-library")
+    id("com.gradle.plugin-publish")
+    id("maven-publish")
+}
+
+dependencies {
+    val libs = project.the<VersionCatalogsExtension>().named("libs")
+    implementation(project(":gradle-model"))
+    implementation(libs.getLibrary("quarkus-devtools-common"))
+}
+
+gradlePlugin {
+    website.set("https://quarkus.io/")
+    vcsUrl.set("https://github.com/quarkusio/quarkus")
+}

devtools/gradle/build-logic/src/main/kotlin/io.quarkus.devtools.java-library.gradle.kts

@@ -0,0 +1,45 @@
+plugins {
+    id("java-library")
+    id("maven-publish")
+}
+
+dependencies {
+    api(gradleApi())
+
+    val libs = project.the<VersionCatalogsExtension>().named("libs")
+    implementation(platform("io.quarkus:quarkus-bom:$version"))
+
+    implementation(libs.getLibrary("quarkus-bootstrap-core"))
+    implementation(libs.getLibrary("quarkus-bootstrap-gradle-resolver"))
+    implementation(libs.getLibrary("quarkus-core-deployment"))
+
+    testImplementation(platform("io.quarkus:quarkus-bom:$version"))
+    testImplementation(platform(libs.getLibrary("junit-bom")))
+    testImplementation(gradleTestKit())
+    testImplementation(libs.getLibrary("junit-api"))
+    testImplementation(libs.getLibrary("assertj"))
+
+    testImplementation(libs.getLibrary("quarkus-devtools-testing"))
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.release.set(11)
+    options.encoding = "UTF-8"
+}
+
+tasks.named<Javadoc>(JavaPlugin.JAVADOC_TASK_NAME) {
+    options.encoding = "UTF-8"
+    (options as? CoreJavadocOptions)?.addStringOption("Xdoclint:-reference", "-quiet")
+}
+
+tasks.named<Test>(JavaPlugin.TEST_TASK_NAME) {
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+
+    // propagate the custom local maven repo, in case it's configured
+    if (System.getProperties().containsKey("maven.repo.local")) {
+        systemProperty("maven.repo.local", System.getProperty("maven.repo.local"))
+    }
+}

devtools/gradle/build-logic/src/main/kotlin/utils.kt

@@ -0,0 +1,4 @@
+import org.gradle.api.artifacts.VersionCatalog
+
+fun VersionCatalog.getLibrary(alias: String) =
+    findLibrary(alias).orElseThrow { IllegalArgumentException("library $alias not found in catalog $name") }

devtools/gradle/build.gradle.kts

@@ -0,0 +1,5 @@
+tasks.wrapper {
+    // not sure if it's still required: IntelliJ works fine with `-bin` distribution 
+    // after indexing Gradle API jars
+    distributionType = Wrapper.DistributionType.ALL
+}

devtools/gradle/gradle-application-plugin/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    id("io.quarkus.devtools.gradle-plugin")
+}
+
+dependencies {
+    implementation(libs.smallrye.config.yaml)
+
+    testImplementation(libs.quarkus.project.core.extension.codestarts)
+}
+
+group = "io.quarkus"
+
+gradlePlugin {
+    plugins.create("quarkusPlugin") {
+        id = "io.quarkus"
+        implementationClass = "io.quarkus.gradle.QuarkusPlugin"
+        displayName = "Quarkus Plugin"
+        description =
+            "Builds a Quarkus application, and provides helpers to launch dev-mode, the Quarkus CLI, building of native images"
+        tags.addAll("quarkus", "quarkusio", "graalvm")
+    }
+}
+
+tasks.test {
+  systemProperty("kotlin_version", libs.versions.kotlin.get())
+}

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImagePush.java

@@ -33,12 +33,12 @@ public void checkRequiredExtensions() {
                 .collect(Collectors.toList());
 
         if (containerImageExtensions.isEmpty()) {
-            getProject().getLogger().warn("Task: {} requires a container image extension.", getName());
-            getProject().getLogger().warn("Available container image exntesions: [{}]",
+            getLogger().warn("Task: {} requires a container image extension.", getName());
+            getLogger().warn("Available container image exntesions: [{}]",
                     extensions.stream().collect(Collectors.joining(", ")));
-            getProject().getLogger().warn("To add an extension to the project, you can run one of the commands below:");
+            getLogger().warn("To add an extension to the project, you can run one of the commands below:");
             extensions.forEach(e -> {
-                getProject().getLogger().warn("\tgradle addExtension --extensions={}", e);
+                getLogger().warn("\tgradle addExtension --extensions={}", e);
             });
         }
     }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/ImageTask.java

@@ -69,17 +69,17 @@ public void checkRequiredExtensions() {
         List<Builder> availableBuidlers = availableBuilders();
         Optional<Builder> missingBuilder = Optional.of(builder()).filter(Predicate.not(availableBuidlers::contains));
         missingBuilder.map(builder -> QUARKUS_CONTAINER_IMAGE_PREFIX + builder.name()).ifPresent(missingDependency -> {
-            getProject().getLogger().warn("Task: {} requires extensions: {}", getName(), missingDependency);
-            getProject().getLogger().warn("To add the extensions to the project you can run the following command:");
-            getProject().getLogger().warn("\tgradle addExtension --extensions={}", missingDependency);
+            getLogger().warn("Task: {} requires extensions: {}", getName(), missingDependency);
+            getLogger().warn("To add the extensions to the project you can run the following command:");
+            getLogger().warn("\tgradle addExtension --extensions={}", missingDependency);
             abort("Aborting.");
         });
 
         if (!missingBuilder.isPresent() && availableBuidlers.isEmpty()) {
-            getProject().getLogger().warn("Task: {} requires on of extensions: {}", getName(),
+            getLogger().warn("Task: {} requires on of extensions: {}", getName(),
                     Arrays.stream(Builder.values()).map(Builder::name).collect(Collectors.joining(", ", "[", "]")));
-            getProject().getLogger().warn("To add the extensions to the project you can run the following command:");
-            getProject().getLogger().warn("\tgradle addExtension --extensions=<extension name>");
+            getLogger().warn("To add the extensions to the project you can run the following command:");
+            getLogger().warn("\tgradle addExtension --extensions=<extension name>");
             abort("Aborting.");
         }
     }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java

@@ -253,7 +253,7 @@ void generateBuild() {
     }
 
     void abort(String message, Object... args) {
-        getProject().getLogger().warn(message, args);
+        getLogger().warn(message, args);
         getProject().getTasks().stream()
                 .filter(t -> t != this)
                 .filter(t -> !t.getState().getExecuted()).forEach(t -> {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java

@@ -446,7 +446,7 @@ private QuarkusDevModeLauncher newLauncher() throws Exception {
                     File file = p.toFile();
                     if (file.exists() && configuredParentFirst.contains(artifact.getKey())
                             && filesIncludedInClasspath.add(file)) {
-                        getProject().getLogger().debug("Adding dependency {}", file);
+                        getLogger().debug("Adding dependency {}", file);
                         builder.classpathEntry(artifact.getKey(), file);
                     }
                 });

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusInfo.java

@@ -30,8 +30,7 @@ public QuarkusInfo() {
 
     @TaskAction
     public void logInfo() {
-
-        getProject().getLogger().warn(getName() + " is experimental, its options and output might change in future versions");
+        getLogger().warn(getName() + " is experimental, its options and output might change in future versions");
 
         final QuarkusProject quarkusProject = getQuarkusProject(false);
         final QuarkusCommandOutcome outcome;
@@ -44,7 +43,7 @@ public void logInfo() {
             throw new GradleException("Failed to collect Quarkus project information", e);
         }
         if (outcome.getValue(ProjectInfoCommandHandler.RECOMMENDATIONS_AVAILABLE, false)) {
-            this.getProject().getLogger().warn(
+            getLogger().warn(
                     "Non-recommended Quarkus platform BOM and/or extension versions were found. For more details, please, execute 'gradle quarkusUpdate --rectify'");
         }
     }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusListPlatforms.java

@@ -28,9 +28,9 @@ public void setInstalled(boolean installed) {
 
     @TaskAction
     public void listExtensions() {
-        getProject().getLogger().info("");
+        getLogger().info("");
         if (installed) {
-            getProject().getLogger().info("Imported Quarkus platforms:");
+            getLogger().info("Imported Quarkus platforms:");
             importedPlatforms().forEach(coords -> {
                 final StringBuilder buf = new StringBuilder();
                 buf.append(coords.getGroupId()).append(":")
@@ -40,13 +40,13 @@ public void listExtensions() {
                 messageWriter().info(buf.toString());
             });
         } else {
-            getProject().getLogger().info("Available Quarkus platforms:");
+            getLogger().info("Available Quarkus platforms:");
             try {
                 new ListPlatforms(getQuarkusProject(installed)).execute();
             } catch (Exception e) {
                 throw new GradleException("Unable to list platforms", e);
             }
         }
-        getProject().getLogger().info("");
+        getLogger().info("");
     }
 }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java

@@ -140,7 +140,7 @@ protected QuarkusProject getQuarkusProject(boolean limitExtensionsToImportedPlat
     }
 
     protected GradleMessageWriter messageWriter() {
-        return new GradleMessageWriter(getProject().getLogger());
+        return new GradleMessageWriter(getLogger());
     }
 
     protected static URL toURL(String url) {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusUpdate.java

@@ -115,8 +115,7 @@ public QuarkusUpdate() {
 
     @TaskAction
     public void logUpdates() {
-
-        getProject().getLogger().warn(getName() + " is experimental, its options and output might change in future versions");
+        getLogger().warn(getName() + " is experimental, its options and output might change in future versions");
         final QuarkusProject quarkusProject = getQuarkusProject(false);
         final ExtensionCatalog targetCatalog;
         try {