Minor fixes to the publishing and catalog plugins (#189)

* Publish all modules in the root build directory Previously, the task which allowed creating a local Maven repository in the build directory used each subproject directory. Now it will use the root project build directory, making it easier to publish all at once in a single test repository. * Fix missing dependencyUpdates task Some CI jobs are calling `dependencyUpdates` which should be a no-op with the new version catalog update mechanism.
micronaut-projects · Sep 7, 2021 · bc158e8 · bc158e8
1 parent 44e91fe
commit bc158e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy b/src/main/groovy/io/micronaut/build/MicronautPublishingPlugin.groovy
@@ -99,7 +99,7 @@ class MicronautPublishingPlugin implements Plugin<Project> {
                     repositories {
                         maven {
                             name = "Build"
-                            url = "${layout.buildDirectory.dir("repo").get().asFile.toURI()}"
+                            url = "${rootProject.layout.buildDirectory.dir("repo").get().asFile.toURI()}"
                         }
                     }
                     publications {

diff --git a/src/main/java/io/micronaut/build/catalogs/MicronautVersionCatalogUpdatePlugin.java b/src/main/java/io/micronaut/build/catalogs/MicronautVersionCatalogUpdatePlugin.java
@@ -7,6 +7,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.Copy;
+import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
 
 import java.util.Arrays;
@@ -17,17 +18,19 @@ public void apply(Project project) {
         if (project != project.getRootProject()) {
             throw new IllegalStateException("The " + MicronautVersionCatalogUpdatePlugin.class.getName() + " plugin must be applied on the root project only");
         }
-        TaskProvider<VersionCatalogUpdate> updater = project.getTasks().register("updateVersionCatalogs", VersionCatalogUpdate.class, task -> {
+        TaskContainer tasks = project.getTasks();
+        TaskProvider<VersionCatalogUpdate> updater = tasks.register("updateVersionCatalogs", VersionCatalogUpdate.class, task -> {
             task.getCatalogsDirectory().convention(project.getLayout().getProjectDirectory().dir("gradle"));
             task.getOutputDirectory().convention(project.getLayout().getProjectDirectory().dir("gradle/updates"));
             task.getRejectedQualifiers().convention(Arrays.asList("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea"));
             task.getIgnoredModules().convention(Collections.emptySet());
             task.getAllowMajorUpdates().convention(false);
         });
-        project.getTasks().register("useLatestVersions", Copy.class, task -> {
+        tasks.register("useLatestVersions", Copy.class, task -> {
             VersionCatalogUpdate dependent = updater.get();
             task.from(dependent.getOutputDirectory());
             task.into(dependent.getCatalogsDirectory());
         });
+        tasks.register("dependencyUpdates", task -> task.setDescription("Compatibility task with the old update mechanism"));
     }
 }