fix

Author: DavideD

release/build.gradle

@@ -36,6 +36,58 @@ final String docWebsiteRelativePath = "reactive/documentation/${projectVersion.f
 // The location of the docs when the website has been cloned
 final Directory docWebsiteReactiveFolder = project.layout.buildDirectory.dir( "docs-website/${docWebsiteRelativePath}" ).get()
 
+def releaseChecksTask = tasks.register( "releaseChecks" ) {
+    description 'Checks and preparation for release'
+    group 'Release'
+
+    doFirst {
+        logger.lifecycle("Checking that the working tree is clean...")
+        String uncommittedFiles = executeGitCommand('status', '--porcelain')
+        if (!uncommittedFiles.isEmpty()) {
+            throw new GradleException(
+                    "Cannot release because there are uncommitted or untracked files in the working tree.\n" +
+                            "Commit or stash your changes first.\n" +
+                            "Uncommitted files:\n    " +
+                            uncommittedFiles
+            )
+        }
+
+        String gitBranchLocal = project.hasProperty( 'gitBranch' ) && !project.property( 'gitBranch' ).isEmpty()
+                ? project.property( 'gitBranch' )
+                : executeGitCommand( 'branch', '--show-current' ).trim()
+
+        String gitRemoteLocal
+        if ( project.hasProperty( 'gitRemote' ) && !project.property( 'gitRemote' ).isEmpty() ) {
+            gitRemoteLocal = project.property( 'gitRemote' )
+        }
+        else {
+            final String remotes = executeGitCommand( 'remote', 'show' ).trim()
+            final List<String> tokens = remotes.tokenize()
+            if ( tokens.size() != 1 ) {
+                throw new GradleException( "Could not determine `gitRemote` property for `releaseChecks` tasks." )
+            }
+            gitRemoteLocal = tokens.get( 0 )
+        }
+
+        project.ext {
+            gitBranch = gitBranchLocal
+            gitRemote = gitRemoteLocal
+        }
+
+        logger.lifecycle( "Switching to branch '${project.gitBranch}'..." )
+        executeGitCommand( 'checkout', project.gitBranch )
+
+        logger.lifecycle( "Checking that all commits are pushed..." )
+        String diffWithUpstream = executeGitCommand( 'diff', '@{u}' )
+        if ( !diffWithUpstream.isEmpty() ) {
+            throw new GradleException(
+                    "Cannot perform `ciRelease` tasks because there are un-pushed local commits .\n" +
+                            "Push your commits first."
+            )
+        }
+    }
+}
+
 /**
  * Assembles all documentation into the {buildDir}/documentation directory.
  */
@@ -70,9 +122,22 @@ def sparseCheckoutDocumentationTask = tasks.register( 'sparseCheckoutDocumentati
 /**
 * Update the docs on the cloned website
 */
+def changeToReleaseVersionTask = tasks.register( 'changeToReleaseVersion' ) {
+    description 'Updates `gradle/version.properties` file to the specified release-version'
+    group 'Release'
+
+    dependsOn releaseChecksTask
+
+    doFirst {
+        logger.lifecycle( "Updating version-file to release-version : `${project.releaseVersion}`" )
+        updateVersionFile( "${project.releaseVersion}" )
+    }
+}
+
 def updateDocumentationTask = tasks.register( 'updateDocumentation' ) {
     description "Update the documentation on the cloned static website"
     dependsOn assembleDocumentationTask, sparseCheckoutDocumentationTask
+    mustRunAfter changeToReleaseVersion
 
     // copy documentation outputs into target/documentation:
     // * this is used in building the dist bundles
@@ -124,70 +189,6 @@ def uploadDocumentationTask = tasks.register( 'uploadDocumentation' ) {
     }
 }
 
-def releaseChecksTask = tasks.register( "releaseChecks" ) {
-    description 'Checks and preparation for release'
-    group 'Release'
-
-    doFirst {
-        logger.lifecycle("Checking that the working tree is clean...")
-        String uncommittedFiles = executeGitCommand('status', '--porcelain')
-        if (!uncommittedFiles.isEmpty()) {
-            throw new GradleException(
-                    "Cannot release because there are uncommitted or untracked files in the working tree.\n" +
-                            "Commit or stash your changes first.\n" +
-                            "Uncommitted files:\n    " +
-                            uncommittedFiles
-            )
-        }
-
-        String gitBranchLocal = project.hasProperty( 'gitBranch' ) && !project.property( 'gitBranch' ).isEmpty()
-                ? project.property( 'gitBranch' )
-                : executeGitCommand( 'branch', '--show-current' ).trim()
-
-        String gitRemoteLocal
-        if ( project.hasProperty( 'gitRemote' ) && !project.property( 'gitRemote' ).isEmpty() ) {
-            gitRemoteLocal = project.property( 'gitRemote' )
-        }
-        else {
-            final String remotes = executeGitCommand( 'remote', 'show' ).trim()
-            final List<String> tokens = remotes.tokenize()
-            if ( tokens.size() != 1 ) {
-                throw new GradleException( "Could not determine `gitRemote` property for `releaseChecks` tasks." )
-            }
-            gitRemoteLocal = tokens.get( 0 )
-        }
-
-        project.ext {
-            gitBranch = gitBranchLocal
-            gitRemote = gitRemoteLocal
-        }
-
-        logger.lifecycle( "Switching to branch '${project.gitBranch}'..." )
-        executeGitCommand( 'checkout', project.gitBranch )
-
-        logger.lifecycle( "Checking that all commits are pushed..." )
-        String diffWithUpstream = executeGitCommand( 'diff', '@{u}' )
-        if ( !diffWithUpstream.isEmpty() ) {
-            throw new GradleException(
-                    "Cannot perform `ciRelease` tasks because there are un-pushed local commits .\n" +
-                            "Push your commits first."
-            )
-        }
-    }
-}
-
-def changeToReleaseVersionTask = tasks.register( 'changeToReleaseVersion' ) {
-    description 'Updates `gradle/version.properties` file to the specified release-version'
-    group 'Release'
-
-    dependsOn releaseChecksTask
-
-    doFirst {
-        logger.lifecycle( "Updating version-file to release-version : `${project.releaseVersion}`" )
-        updateVersionFile( "${project.releaseVersion}" )
-    }
-}
-
 def gitPreparationForReleaseTask = tasks.register( 'gitPreparationForRelease' ) {
     dependsOn releaseChecksTask, changeToReleaseVersionTask
     finalizedBy updateDocumentationTask
@@ -254,7 +255,7 @@ def releasePrepareTask = tasks.register( "releasePrepare" ) {
     description "On a local checkout, performs all the changes required for the release, website updates included"
     group "Release"
 
-    dependsOn assembleDocumentationTask, gitPreparationForReleaseTask
+    dependsOn gitPreparationForReleaseTask
 
     finalizedBy releasePreparePostGitTask
 }