Remove Closure taking methods from RepositoryHandler

gradle · big-guy · Sep 24, 2022 · Sep 24, 2022 · Sep 24, 2022 · Sep 24, 2022
commit 4fc0614dfaad8f3f8d2308ca5170129b9f6209af
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/artifacts/dsl/RepositoryHandler.java b/subprojects/core-api/src/main/java/org/gradle/api/artifacts/dsl/RepositoryHandler.java
@@ -15,8 +15,6 @@
  */
 package org.gradle.api.artifacts.dsl;
 
-import groovy.lang.Closure;
-import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ArtifactRepositoryContainer;
 import org.gradle.api.artifacts.repositories.ArtifactRepository;
@@ -68,14 +66,6 @@ public interface RepositoryHandler extends ArtifactRepositoryContainer {
      */
     FlatDirectoryArtifactRepository flatDir(Map<String, ?> args);
 
-    /**
-     * Adds an configures a repository which will look for dependencies in a number of local directories.
-     *
-     * @param configureClosure The closure to execute to configure the repository.
-     * @return The repository.
-     */
-    FlatDirectoryArtifactRepository flatDir(@DelegatesTo(FlatDirectoryArtifactRepository.class) Closure configureClosure);
-
     /**
      * Adds an configures a repository which will look for dependencies in a number of local directories.
      *
@@ -300,14 +290,6 @@ public interface RepositoryHandler extends ArtifactRepositoryContainer {
      */
     MavenArtifactRepository google(Action<? super MavenArtifactRepository> action);
 
-    /**
-     * Adds and configures a Maven repository. Newly created instance of {@code MavenArtifactRepository} is passed as an argument to the closure.
-     *
-     * @param closure The closure to use to configure the repository.
-     * @return The added repository.
-     */
-    MavenArtifactRepository maven(@DelegatesTo(MavenArtifactRepository.class) Closure closure);
-
     /**
      * Adds and configures a Maven repository.
      *
@@ -316,14 +298,6 @@ public interface RepositoryHandler extends ArtifactRepositoryContainer {
      */
     MavenArtifactRepository maven(Action<? super MavenArtifactRepository> action);
 
-    /**
-     * Adds and configures an Ivy repository. Newly created instance of {@code IvyArtifactRepository} is passed as an argument to the closure.
-     *
-     * @param closure The closure to use to configure the repository.
-     * @return The added repository.
-     */
-    IvyArtifactRepository ivy(@DelegatesTo(IvyArtifactRepository.class) Closure closure);
-
     /**
      * Adds and configures an Ivy repository.
      *

@@ -16,7 +16,6 @@
 package org.gradle.api.internal.artifacts.dsl;
 
 import com.google.common.collect.Lists;
-import groovy.lang.Closure;
 import org.gradle.api.Action;
 import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
@@ -36,7 +35,6 @@
 import org.gradle.internal.Factory;
 import org.gradle.internal.deprecation.DeprecationLogger;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.util.internal.ConfigureUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -73,12 +71,6 @@ public FlatDirectoryArtifactRepository flatDir(Action<? super FlatDirectoryArtif
         return addRepository(repositoryFactory.createFlatDirRepository(), FLAT_DIR_DEFAULT_NAME, action);
     }
 
-    @Override
-    @SuppressWarnings("rawtypes")
-    public FlatDirectoryArtifactRepository flatDir(Closure configureClosure) {
-        return flatDir(ConfigureUtil.configureUsing(configureClosure));
-    }
-
     @Override
     public FlatDirectoryArtifactRepository flatDir(Map<String, ?> args) {
         Map<String, Object> modifiedArgs = new HashMap<>(args);
@@ -161,23 +153,11 @@ public MavenArtifactRepository maven(Action<? super MavenArtifactRepository> act
         return addRepository(repositoryFactory.createMavenRepository(), MAVEN_REPO_DEFAULT_NAME, action);
     }
 
-    @Override
-    @SuppressWarnings("rawtypes")
-    public MavenArtifactRepository maven(Closure closure) {
-        return maven(ConfigureUtil.configureUsing(closure));
-    }
-
     @Override
     public IvyArtifactRepository ivy(Action<? super IvyArtifactRepository> action) {
         return addRepository(repositoryFactory.createIvyRepository(), IVY_REPO_DEFAULT_NAME, action);
     }
 
-    @Override
-    @SuppressWarnings("rawtypes")
-    public IvyArtifactRepository ivy(Closure closure) {
-        return ivy(ConfigureUtil.configureUsing(closure));
-    }
-
     @Override
     public void exclusiveContent(Action<? super ExclusiveContentRepository> action) {
         ExclusiveContentRepositorySpec spec = Cast.uncheckedCast(instantiator.newInstance(ExclusiveContentRepositorySpec.class, this));