From d84fca4d63b55bf7caf0cf5224875ff984bc927a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 16 Feb 2016 10:47:07 +0000 Subject: [PATCH] Ensure that version updates are applied to Slate sample --- build.gradle | 5 +++ .../build/SampleBuildConfigurer.groovy | 42 +++++++++---------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 1c00729c..f6f40e61 100644 --- a/build.gradle +++ b/build.gradle @@ -171,6 +171,11 @@ samples { restAssured { workingDir "$projectDir/samples/rest-assured" } + + slate { + workingDir "$projectDir/samples/rest-notes-slate" + build false + } } task api (type: Javadoc) { diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy index c960ee1e..7ce726de 100644 --- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy +++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy @@ -29,7 +29,7 @@ public class SampleBuildConfigurer { private String workingDir - private boolean verifyIncludes = true + private boolean build = true SampleBuildConfigurer(String name) { this.name = name @@ -39,31 +39,41 @@ public class SampleBuildConfigurer { this.workingDir = workingDir } + void build(boolean build) { + this.build = build + } + Task createTask(Project project, Object... dependencies) { File sampleDir = new File(this.workingDir).absoluteFile + Task sampleBuild = project.tasks.create name sampleBuild.description = "Builds the ${name} sample" sampleBuild.group = "Build" + if (new File(sampleDir, 'build.gradle').isFile()) { - Task gradleBuild = createGradleBuild(project, dependencies) - if (verifyIncludes) { + if (build) { + Task gradleBuild = createGradleBuild(project, dependencies) Task verifyIncludesTask = createVerifyIncludes(project, new File(sampleDir, 'build/asciidoc')) verifyIncludesTask.dependsOn gradleBuild sampleBuild.dependsOn verifyIncludesTask } - else { - sampleBuild.dependsOn gradleBuild + sampleBuild.doFirst { + replaceVersion(new File(this.workingDir, 'build.gradle'), + "springRestdocsVersion = '.*'", + "springRestdocsVersion = '${project.version}'") } } else if (new File(sampleDir, 'pom.xml').isFile()) { - Task mavenBuild = createMavenBuild(project, sampleDir, dependencies) - if (verifyIncludes) { + if (build) { + Task mavenBuild = createMavenBuild(project, sampleDir, dependencies) Task verifyIncludesTask = createVerifyIncludes(project, new File(sampleDir, 'target/generated-docs')) verifyIncludesTask.dependsOn(mavenBuild) sampleBuild.dependsOn verifyIncludesTask } - else { - sampleBuild.dependsOn mavenBuild + sampleBuild.doFirst { + replaceVersion(new File(this.workingDir, 'pom.xml'), + '.*', + "${project.version}") } } else { @@ -79,13 +89,6 @@ public class SampleBuildConfigurer { mavenBuild.workingDir = this.workingDir mavenBuild.commandLine = [isWindows() ? "${sampleDir.absolutePath}/mvnw.cmd" : './mvnw', 'clean', 'package'] mavenBuild.dependsOn dependencies - - mavenBuild.doFirst { - replaceVersion(new File(this.workingDir, 'pom.xml'), - '.*', - "${project.version}") - } - return mavenBuild } @@ -100,13 +103,6 @@ public class SampleBuildConfigurer { gradleBuild.dir = this.workingDir gradleBuild.tasks = ['clean', 'build'] gradleBuild.dependsOn dependencies - - gradleBuild.doFirst { - replaceVersion(new File(this.workingDir, 'build.gradle'), - "springRestdocsVersion = '.*'", - "springRestdocsVersion = '${project.version}'") - } - return gradleBuild }