Merge remote-tracking branch 'origin/sg/50/placeholders'

* origin/sg/50/placeholders:
  remove TaskConfiguration by inlining all methods
  Remove unnecessary method
  Add since 5.0 tag
  Hold a project lock when reporting on tasks in other projects
  Add release notes for removed placeholder tasks
  Relax ordering of plugin application operation asserts
  Fix integration tests that relied on placeholder behavior
  Remove placeholder tasks

subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/internal/WrapperPluginAutoApplyActionIntegTest.groovy

@@ -82,23 +82,4 @@ class WrapperPluginAutoApplyActionIntegTest extends AbstractIntegrationSpec {
         then:
         wrapper.generated()
     }
-
-    def "manually declared wrapper task is preferred, but deprecated"() {
-        when:
-        buildFile << """
-
-                task wrapper {
-                    doLast {
-                        println "running custom wrapper task"
-                    }
-                }
-            """
-        executer.expectDeprecationWarning()
-        run 'wrapper'
-        then:
-
-        outputContains("running custom wrapper task")
-        outputContains("Creating a custom task named 'wrapper' has been deprecated.")
-        wrapper.notGenerated()
-    }
 }

subprojects/build-init/src/main/java/org/gradle/buildinit/plugins/BuildInitPlugin.java

@@ -16,16 +16,78 @@
 
 package org.gradle.buildinit.plugins;
 
+import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.buildinit.tasks.internal.TaskConfiguration;
+import org.gradle.api.Task;
+import org.gradle.api.specs.Spec;
+import org.gradle.buildinit.plugins.internal.modifiers.BuildInitDsl;
+import org.gradle.buildinit.tasks.InitBuild;
+
+import java.io.File;
+import java.util.concurrent.Callable;
 
 /**
  * The build init plugin.
  */
 public class BuildInitPlugin implements Plugin<Project> {
     public void apply(final Project project) {
-        TaskConfiguration.addInitPlaceholder((ProjectInternal) project);
+        if (project.getParent() == null) {
+            project.getTasks().register("init", InitBuild.class, new Action<InitBuild>() {
+                @Override
+                public void execute(InitBuild initBuild) {
+                    initBuild.setGroup("Build Setup");
+                    initBuild.setDescription("Initializes a new Gradle build.");
+
+                    initBuild.onlyIf(new Spec<Task>() {
+                        @Override
+                        public boolean isSatisfiedBy(Task element) {
+                            Object skippedMsg = reasonToSkip(project);
+                            if (skippedMsg != null) {
+                                project.getLogger().warn((String) skippedMsg);
+                                return false;
+                            }
+
+                            return true;
+                        }
+                    });
+
+                    initBuild.dependsOn(new Callable<String>() {
+                        @Override
+                        public String call() throws Exception {
+                            if (reasonToSkip(project) == null) {
+                                return "wrapper";
+                            } else {
+                                return null;
+                            }
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    private String reasonToSkip(Project project) {
+        for (BuildInitDsl dsl : BuildInitDsl.values()) {
+            String buildFileName = dsl.fileNameFor("build");
+            if (project.file(buildFileName).exists()) {
+                return "The build file '" + buildFileName + "' already exists. Skipping build initialization.";
+            }
+            String settingsFileName = dsl.fileNameFor("settings");
+            if (project.file(settingsFileName).exists()) {
+                return "The settings file '" + settingsFileName + "' already exists. Skipping build initialization.";
+            }
+        }
+
+        File buildFile = project.getBuildFile();
+        if (buildFile != null && buildFile.exists()) {
+            return "The build file \'" + buildFile.getName() + "\' already exists. Skipping build initialization.";
+        }
+
+        if (project.getSubprojects().size() > 0) {
+            return "This Gradle project appears to be part of an existing multi-project Gradle build. Skipping build initialization.";
+        }
+
+        return null;
     }
 }

subprojects/build-init/src/main/java/org/gradle/buildinit/plugins/WrapperPlugin.java

@@ -16,16 +16,24 @@
 
 package org.gradle.buildinit.plugins;
 
+import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.buildinit.tasks.internal.TaskConfiguration;
+import org.gradle.api.tasks.wrapper.Wrapper;
 
 /**
  * The wrapper plugin.
  */
 public class WrapperPlugin implements Plugin<Project> {
     public void apply(Project project) {
-        TaskConfiguration.addWrapperPlaceholder((ProjectInternal) project);
+        if (project.getParent() == null) {
+            project.getTasks().register("wrapper", Wrapper.class, new Action<Wrapper>() {
+                @Override
+                public void execute(Wrapper wrapper) {
+                    wrapper.setGroup("Build Setup");
+                    wrapper.setDescription("Generates Gradle wrapper files.");
+                }
+            });
+        }
     }
 }

subprojects/build-init/src/main/java/org/gradle/buildinit/plugins/internal/action/BuildInitAutoApplyAction.java

@@ -17,13 +17,12 @@
 package org.gradle.buildinit.plugins.internal.action;
 
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.buildinit.tasks.internal.TaskConfiguration;
 import org.gradle.configuration.project.ProjectConfigureAction;
 
 public class BuildInitAutoApplyAction implements ProjectConfigureAction {
 
-    public void execute(final ProjectInternal projectInternal) {
-        TaskConfiguration.addInitPlaceholder(projectInternal);
+    public void execute(final ProjectInternal project) {
+        project.getPluginManager().apply("org.gradle.build-init");
     }
 
-}
+}

subprojects/build-init/src/main/java/org/gradle/buildinit/plugins/internal/action/WrapperPluginAutoApplyAction.java

@@ -17,12 +17,11 @@
 package org.gradle.buildinit.plugins.internal.action;
 
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.buildinit.tasks.internal.TaskConfiguration;
 import org.gradle.configuration.project.ProjectConfigureAction;
 
 public class WrapperPluginAutoApplyAction implements ProjectConfigureAction {
     @Override
     public void execute(ProjectInternal project) {
-        TaskConfiguration.addWrapperPlaceholder(project);
+        project.getPluginManager().apply("org.gradle.wrapper");
     }
 }

subprojects/build-init/src/test/groovy/org/gradle/buildinit/plugins/WrapperPluginSpec.groovy

@@ -18,7 +18,6 @@
 package org.gradle.buildinit.plugins
 
 import org.gradle.api.tasks.wrapper.Wrapper
-import org.gradle.buildinit.tasks.internal.TaskConfiguration
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.TestUtil
 import org.gradle.util.UsesNativeServices
@@ -37,6 +36,6 @@ class WrapperPluginSpec extends Specification {
 
         then:
         project.tasks.wrapper instanceof Wrapper
-        project.tasks.wrapper.group == TaskConfiguration.GROUP
+        project.tasks.wrapper.group == "Build Setup"
     }
 }