Revert "#19: release.dependsOn config is no longer mandatory in root …

…of multi-project setup" This approach will not be supported in Gradle 3 This reverts commit ec4e541.
netzwerg · Apr 24, 2015 · 09febe3 · 09febe3
1 parent ec4e541
commit 09febe3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/src/main/groovy/ch/netzwerg/gradle/release/ReleaseExtension.groovy b/src/main/groovy/ch/netzwerg/gradle/release/ReleaseExtension.groovy
@@ -21,12 +21,10 @@ import org.gradle.util.ConfigureUtil
 
 class ReleaseExtension {
 
-    public static final String DEFAULT_DEPENDS_ON_TASK_NAME = 'build'
-    public static final DEFAULT_DEPENDS_ON = Collections.singletonList(DEFAULT_DEPENDS_ON_TASK_NAME)
-
     private static final DEFAULT_VERSION_FILE = 'version.txt'
+    private static final DEFAULT_DEPENDS_ON = Collections.singletonList('build')
     private static final DEFAULT_PUSH = false
-    private static final DEFAULT_TAG_PREFIX = 'v'
+	private static final DEFAULT_TAG_PREFIX = 'v'
     private static final DEFAULT_VERSION_SUFFIX = '-SNAPSHOT'
 
     private final Project project

diff --git a/src/main/groovy/ch/netzwerg/gradle/release/ReleasePlugin.groovy b/src/main/groovy/ch/netzwerg/gradle/release/ReleasePlugin.groovy
@@ -19,8 +19,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.slf4j.LoggerFactory
 
-import static ch.netzwerg.gradle.release.ReleaseExtension.*
-
 class ReleasePlugin implements Plugin<Project> {
 
     public static final String RELEASE_TASK_NAME = 'release'
@@ -30,9 +28,6 @@ class ReleasePlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-
-        project.evaluationDependsOnChildren()
-
         LOGGER.debug("Registering extension '$RELEASE_EXTENSION_NAME'")
         def releaseExtension = project.extensions.create(RELEASE_EXTENSION_NAME, ReleaseExtension, project)
 
@@ -42,6 +37,7 @@ class ReleasePlugin implements Plugin<Project> {
 
         LOGGER.debug("Initializing project.version from $releaseExtension.versionFile")
         project.version = releaseExtension.versionFile.text.trim()
+        LOGGER.debug("Set project.version to $project.version")
 
         project.afterEvaluate {
             if (project.gradle.startParameter.taskNames.contains(RELEASE_TASK_NAME)) {
@@ -51,24 +47,8 @@ class ReleasePlugin implements Plugin<Project> {
                     LOGGER.debug("Setting '$releaseExtension.versionFile' contents to $project.version")
                     releaseExtension.versionFile.text = project.version
                 }
-                if (isUsingUndefinedDefaultDependsOn(project, releaseExtension)) {
-                    LOGGER.debug("Creating artificial '$DEFAULT_DEPENDS_ON_TASK_NAME' default task")
-                    def subDefaultTasks = project.subprojects.collect {
-                        it.tasks.findByPath(DEFAULT_DEPENDS_ON_TASK_NAME)
-                    }
-                    project.tasks.create(DEFAULT_DEPENDS_ON_TASK_NAME).dependsOn(subDefaultTasks);
-                }
             }
         }
     }
 
-    private static boolean isUsingUndefinedDefaultDependsOn(Project project, ReleaseExtension releaseExtension) {
-        boolean untouchedDefaultDependsOn = DEFAULT_DEPENDS_ON == releaseExtension.dependsOn
-        untouchedDefaultDependsOn && isDefaultDependsOnUndefined(project)
-    }
-
-    private static boolean isDefaultDependsOnUndefined(Project project) {
-        project.tasks.findByName(DEFAULT_DEPENDS_ON_TASK_NAME) == null
-    }
-
 }