diff --git a/build.gradle b/build.gradle index c8b370644c..8afc301165 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ buildscript { ext.kotlinVersion = '1.5.32' repositories { + gradlePluginPortal() mavenCentral() - maven { url 'https://plugins.gradle.org/m2' } - maven { url 'https://repo.spring.io/plugins-release-local' } + if (version.endsWith('SNAPSHOT')) { + maven { url 'https://repo.spring.io/snapshot' } + } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 24a59ce8ee..53a7f7a6be 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -1,31 +1,17 @@ ext { - docResourcesVersion = '0.2.5' - blockSwitchVersion = '0.5.0' + backendVersion = '0.0.5' } configurations { - docs - asciidoctorExt + asciidoctorExtensions } dependencies { - docs "io.spring.docresources:spring-doc-resources:${docResourcesVersion}@zip" - asciidoctorExt "io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:$blockSwitchVersion" -} - -task prepareAsciidocBuild(type: Sync) { - dependsOn configurations.docs - from { - configurations.docs.collect { zipTree(it) } - } - duplicatesStrategy = DuplicatesStrategy.INCLUDE - from 'src/reference/asciidoc/' - into "$buildDir/asciidoc" + asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:$backendVersion" } task checkAsciidocLinks { - dependsOn prepareAsciidocBuild - inputs.dir("$buildDir/asciidoc") + inputs.dir('src/reference/asciidoc') doLast { def errors = new ArrayList<>(); errors.add('*** Anchor reference errors found:') @@ -65,7 +51,7 @@ task checkAsciidocLinks { asciidoctorPdf { dependsOn checkAsciidocLinks baseDirFollowsSourceFile() - configurations 'asciidoctorExt' + configurations 'asciidoctorExtensions' asciidoctorj { sourceDir "$buildDir/asciidoc" @@ -109,7 +95,7 @@ asciidoctorj { asciidoctor { dependsOn asciidoctorPdf baseDirFollowsSourceFile() - configurations 'asciidoctorExt' + configurations 'asciidoctorExtensions' sourceDir "$buildDir/asciidoc" inputs.dir(sourceDir) resources {