From cf0aac095b9d2c26d5cee46c2317cd0124d1fa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Champeau?= <cedric.champeau@gmail.com>
Date: Wed, 29 Dec 2021 21:40:04 +0100
Subject: [PATCH] Fix useLatestVersions (#250)

This commit fixes the "useLatestVersions" task which was broken in 2
cases:

- for most projects, it wouldn't run the `dependencyUpdates` task
prior to execution
- for projects using version catalogs, the version catalog update
plugin should be used instead
---
 build.gradle                                             | 2 +-
 .../build/MicronautDependencyUpdatesPlugin.groovy        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d25218ad..d1ccaf6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     implementation "com.diffplug.spotless:spotless-plugin-gradle:5.14.2"
     implementation "com.adarshr:gradle-test-logger-plugin:3.0.0"
     implementation "io.github.gradle-nexus:publish-plugin:1.1.0"
-    implementation "se.patrikerdes:gradle-use-latest-versions-plugin:0.2.16"
+    implementation "se.patrikerdes:gradle-use-latest-versions-plugin:0.2.18"
     implementation('com.lowagie:itext:2.0.8')
     implementation 'org.jsoup:jsoup:1.14.2'
     implementation('org.xhtmlrenderer:core-renderer:8.0') {
diff --git a/src/main/groovy/io/micronaut/build/MicronautDependencyUpdatesPlugin.groovy b/src/main/groovy/io/micronaut/build/MicronautDependencyUpdatesPlugin.groovy
index b62710d6..4aa23ed3 100644
--- a/src/main/groovy/io/micronaut/build/MicronautDependencyUpdatesPlugin.groovy
+++ b/src/main/groovy/io/micronaut/build/MicronautDependencyUpdatesPlugin.groovy
@@ -1,5 +1,6 @@
 package io.micronaut.build
 
+import io.micronaut.build.catalogs.MicronautVersionCatalogUpdatePlugin
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -18,6 +19,12 @@ class MicronautDependencyUpdatesPlugin implements Plugin<Project> {
     @Override
     void apply(Project project) {
         project.pluginManager.apply(MicronautBuildExtensionPlugin)
+        if (project.rootProject.file("gradle/libs.versions.toml").exists()) {
+            if (project == project.rootProject) {
+                project.pluginManager.apply(MicronautVersionCatalogUpdatePlugin)
+            }
+            return
+        }
         project.apply plugin: GRADLE_VERSIONS_PLUGIN
         project.apply plugin: USE_LATEST_VERSIONS_PLUGIN
 
@@ -32,7 +39,7 @@ class MicronautDependencyUpdatesPlugin implements Plugin<Project> {
         project.with {
             tasks.named("dependencyUpdates") {
                 onlyIf {
-                    gradle.taskGraph.hasTask("useLatestVersions")
+                    gradle.taskGraph.hasTask(":useLatestVersions")
                 }
                 checkForGradleUpdate = true
                 gradleReleaseChannel = "current"