Update UpgradePluginVersion and AddPluginVisitor to use MethodMatcher

Use MethodMatcher for version detection in UpgradePluginVersion instead of string-based name matching. Tighten AddPluginVisitor's wildcard id matcher to use real PluginDependenciesSpec type.

Author: timtebeek

rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddPluginVisitor.java

@@ -300,7 +300,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integ
 
     private K.CompilationUnit addPluginToKotlinCompilationUnit(K.CompilationUnit cu, ExecutionContext ctx) {
         MethodMatcher pluginsMatcher = new MethodMatcher("*..* plugins(..)");
-        MethodMatcher pluginIdMatcher = new MethodMatcher("*..* id(..)");
+        MethodMatcher pluginIdMatcher = new MethodMatcher("org.gradle.plugin.use.PluginDependenciesSpec id(..)", true);
         AtomicBoolean hasPlugin = new JavaIsoVisitor<AtomicBoolean>() {
             @Override
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, AtomicBoolean found) {

rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/UpgradePluginVersion.java

@@ -28,6 +28,7 @@
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
 import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.maven.MavenDownloadingException;
@@ -53,6 +54,7 @@
 @EqualsAndHashCode(callSuper = false)
 public class UpgradePluginVersion extends ScanningRecipe<UpgradePluginVersion.DependencyVersionState> {
     private static final String GRADLE_PROPERTIES_FILE_NAME = "gradle.properties";
+    private static final MethodMatcher VERSION_MATCHER = new MethodMatcher("org.gradle.plugin.use.PluginDependencySpec version(..)", true);
 
     @EqualsAndHashCode.Exclude
     transient MavenMetadataFailures metadataFailures = new MavenMetadataFailures(this);
@@ -112,7 +114,7 @@ private boolean isPluginVersion(Cursor cursor) {
             return false;
         }
         J.MethodInvocation maybeVersion = cursor.getValue();
-        if (!"version".equals(maybeVersion.getSimpleName())) {
+        if (!VERSION_MATCHER.matches(maybeVersion, true)) {
             return false;
         }
         Cursor parent = cursor.dropParentUntil(it -> (it instanceof J.MethodInvocation) || it == Cursor.ROOT_VALUE);