fix

Author: DavideD

documentation/build.gradle

@@ -1,7 +1,7 @@
-import java.time.Year
-
 import org.asciidoctor.gradle.jvm.AsciidoctorTask
 
+import java.time.Year
+
 apply plugin: 'org.asciidoctor.jvm.convert'
 
 ext {
@@ -22,21 +22,21 @@ rootProject.subprojects { subproject ->
 // Aggregated JavaDoc
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-final File javadocDir = mkdir( new File( (File) project.buildDir, 'javadocs' ) )
+final File javadocDir = mkdir( project.layout.buildDirectory.dir( "javadocs" ) )
 
 /**
  * Builds the JavaDocs aggregated (unified) across all the sub-projects
  */
-task aggregateJavadocs(type: Javadoc, group: 'Documentation') {
-    description = 'Builds the aggregated (unified) JavaDocs across all sub-projects'
+def aggregateJavadocsTask = tasks.register( 'aggregateJavadocs', Javadoc ) {
+	description = 'Builds the aggregated (unified) JavaDocs across all sub-projects'
 
 	final int inceptionYear = 2020
-    final int currentYear = Year.now().getValue()
+	final int currentYear = Year.now().getValue()
 
-    // exclude any generated sources and internal packages
-    exclude( '**/generated-src/**' )
+	// exclude any generated sources and internal packages
+	exclude( '**/generated-src/**' )
 	exclude( '**/src/main/generated/**' )
-    exclude( '**/internal/**' )
+	exclude( '**/internal/**' )
 	exclude( '**/impl/**' )
 
 	// apply standard config
@@ -63,8 +63,10 @@ task aggregateJavadocs(type: Javadoc, group: 'Documentation') {
 		options.addStringOption( 'Xdoclint:none', '-quiet' )
 
 		if ( gradle.ext.javaToolchainEnabled ) {
-			options.setJFlags( getProperty( 'toolchain.javadoc.jvmargs' ).toString().
-					split( ' ' ).toList().findAll( { !it.isEmpty() } ) )
+			options.setJFlags(
+					getProperty( 'toolchain.javadoc.jvmargs' ).toString().
+							split( ' ' ).toList().findAll( { !it.isEmpty() } )
+			)
 		}
 	}
 
@@ -75,18 +77,18 @@ task aggregateJavadocs(type: Javadoc, group: 'Documentation') {
 		}
 	}
 
-    // process each project, building up:
-    //      1) appropriate sources
-    //      2) classpath
-    parent.subprojects.each { Project subProject->
-        // skip certain sub-projects
-		if ( ! project.projectsToSkipWhenAggregatingJavadocs.contains( subProject.name ) ) {
+	// process each project, building up:
+	//      1) appropriate sources
+	//      2) classpath
+	parent.subprojects.each { Project subProject ->
+		// skip certain sub-projects
+		if ( !project.projectsToSkipWhenAggregatingJavadocs.contains( subProject.name ) ) {
 			// we only care about the main SourceSet...
 			source subProject.sourceSets.main.java
 
 			classpath += subProject.sourceSets.main.output + subProject.sourceSets.main.compileClasspath
 		}
-    }
+	}
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -98,22 +100,22 @@ asciidoctor {
 	enabled = false
 }
 
-task renderReferenceDocumentation(type: AsciidoctorTask, group: 'Documentation') {
-    description = 'Renders the Reference Documentation in HTML format using Asciidoctor.'
-    sourceDir = file( 'src/main/asciidoc/reference' )
-    sources {
-        include 'index.adoc'
-    }
+def renderReferenceDocumentationTask = tasks.register( 'renderReferenceDocumentation', AsciidoctorTask ) {
+	description = 'Renders the Reference Documentation in HTML format using Asciidoctor.'
+	sourceDir = file( 'src/main/asciidoc/reference' )
+	sources {
+		include 'index.adoc'
+	}
 
 	resources {
-		from(sourceDir) {
+		from( sourceDir ) {
 			include 'images/**'
 			include 'css/**'
 		}
 	}
 
-	outputDir = new File("$buildDir/asciidoc/reference/html_single")
-    options logDocuments: true
+	outputDir = project.layout.buildDirectory.dir( "asciidoc/reference/html_single" ).get().asFile
+	options logDocuments: true
 	attributes icons: 'font',
 			   'source-highlighter': 'rouge',
 			   experimental: true,
@@ -128,11 +130,12 @@ task renderReferenceDocumentation(type: AsciidoctorTask, group: 'Documentation')
 // All
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-task assembleDocumentation(dependsOn: [aggregateJavadocs, renderReferenceDocumentation]) {
+def assembleDocumentationTask = tasks.register( 'assembleDocumentation' ) {
+	dependsOn aggregateJavadocsTask, renderReferenceDocumentationTask
 	group 'Documentation'
 	description 'Grouping task for performing all documentation building tasks'
 
 	logger.lifecycle "Documentation groupId: '" + project.group + "', version: '" + project.version + "'"
 }
 
-assemble.dependsOn assembleDocumentation
+assemble.dependsOn assembleDocumentationTask

release/build.gradle

@@ -28,13 +28,13 @@ description = 'Release module'
 //  ./gradlew ciRelease -PreleaseVersion=x.y.z.Final -PdevelopmentVersion=x.y.z-SNAPSHOT -PgitRemote=origin -PgitBranch=main
 
 // The folder containing the rendered documentation
-final String documentationDir = rootProject.layout.buildDirectory.dir( "documentation" )
+final Directory documentationDir = project(":documentation").layout.buildDirectory.get()
 
 // Relative path on the static website where the documentation is located
 final String docWebsiteRelativePath = "reactive/documentation/${projectVersion.family}"
 
 // The location of the docs when the website has been cloned
-final String docWebsiteReactiveFolder = project.layout.buildDirectory.dir( "docs-website/${docWebsiteRelativePath}" )
+final Directory docWebsiteReactiveFolder = project.layout.buildDirectory.dir( "docs-website/${docWebsiteRelativePath}" ).get()
 
 /**
  * Assembles all documentation into the {buildDir}/documentation directory.
@@ -61,7 +61,7 @@ def cloneDocsWebsiteTask = tasks.register( 'cloneDocsWebsite', Exec ) {
     commandLine 'git', 'clone', docPublishRepoUri, '-b', docPublishBranch, '--sparse', '--depth', '1', 'docs-website'
 }
 
-def sparseCheckoutDocumentationTask =tasks.register( 'sparseCheckoutDocumentation', Exec ) {
+def sparseCheckoutDocumentationTask = tasks.register( 'sparseCheckoutDocumentation', Exec ) {
     dependsOn cloneDocsWebsiteTask
     workingDir project.layout.buildDirectory.dir( "docs-website" )
     commandLine 'git', 'sparse-checkout', 'set', docWebsiteRelativePath
@@ -80,18 +80,18 @@ def updateDocumentationTask = tasks.register( 'updateDocumentation' ) {
 
     doLast {
         // delete the folders in case some files have been removed
-        delete "${docWebsiteReactiveFolder}/javadocs", "${docWebsiteReactiveFolder}/reference"
+        delete docWebsiteReactiveFolder.dir("javadocs"), docWebsiteReactiveFolder.dir("reference")
 
         // Aggregated JavaDoc
         copy {
-            from "${documentationDir}/javadocs"
-            into "${docWebsiteReactiveFolder}/javadocs"
+            from documentationDir.dir("javadocs")
+            into docWebsiteReactiveFolder.dir("javadocs")
         }
 
         // Reference Documentation
         copy {
-            from "${documentationDir}/asciidoc/reference/html_single"
-            into "${docWebsiteReactiveFolder}/reference/html_single"
+            from documentationDir.dir("asciidoc/reference/html_single")
+            into docWebsiteReactiveFolder.dir("reference/html_single")
         }
     }
 }