Version bumps are now pushed to the repo

Ensured that version bump runs before git push task
mockito · May 14, 2017 · fbc019a · fbc019a
1 parent 7362324
commit fbc019a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/groovy/org/mockito/release/internal/gradle/ContinuousDeliveryPlugin.java b/src/main/groovy/org/mockito/release/internal/gradle/ContinuousDeliveryPlugin.java
@@ -146,14 +146,20 @@ public void run() {
             }
         });
 
+        //commit task that is added by GitPlugin needs to run after the add bump version task added by AutoVersioningPlugin
+        //TODO: let's think about a way to avoid 'git add' tasks completely.
+        //      We can use git commit with paths to commit specific files without the need for 'add' operation
+        //      Using 'git add' adds complexity and causes weird bugs like #145
+        project.getTasks().getByName(GitPlugin.COMMIT_TASK).mustRunAfter(AutoVersioningPlugin.ADD_BUMP_VERSION_TASK);
+
         TaskMaker.task(project, "performRelease", new Action<Task>() {
             public void execute(final Task t) {
                 t.setDescription("Performs release. " +
                         "Ship with: './gradlew performRelease -Preleasing.dryRun=false'. " +
                         "Test with: './gradlew testRelease'");
 
                 t.dependsOn(VersioningPlugin.BUMP_VERSION_FILE_TASK, "updateReleaseNotes", "updateNotableReleaseNotes");
-                t.dependsOn("gitAddBumpVersion", "gitAddReleaseNotes", GitPlugin.COMMIT_TASK, GitPlugin.TAG_TASK);
+                t.dependsOn(AutoVersioningPlugin.ADD_BUMP_VERSION_TASK, "gitAddReleaseNotes", GitPlugin.COMMIT_TASK, GitPlugin.TAG_TASK);
                 t.dependsOn(GitPlugin.PUSH_TASK);
                 t.dependsOn("bintrayUploadAll");