Skip to content

Commit f8bd59b

Browse files
committed
Update Asciidoctor plugin
1 parent 7622fb5 commit f8bd59b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

documentation/documentation.gradle.kts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.asciidoctor.gradle.base.AsciidoctorAttributeProvider
12
import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
23
import org.gradle.api.tasks.PathSensitivity.RELATIVE
34
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
@@ -190,7 +191,8 @@ tasks {
190191
// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
191192
inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
192193

193-
attributes(mapOf(
194+
attributeProviders += AsciidoctorAttributeProvider {
195+
mapOf(
194196
"jupiter-version" to version,
195197
"platform-version" to project.property("platformVersion"),
196198
"vintage-version" to project.property("vintageVersion"),
@@ -202,10 +204,10 @@ tasks {
202204
"release-branch" to releaseBranch,
203205
"docs-version" to docsVersion,
204206
"revnumber" to version,
205-
"consoleLauncherOptionsFile" to consoleLauncherOptionsFile,
206-
"experimentalApisTableFile" to experimentalApisTableFile,
207-
"deprecatedApisTableFile" to deprecatedApisTableFile,
208-
"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile,
207+
"consoleLauncherOptionsFile" to consoleLauncherOptionsFile.get(),
208+
"experimentalApisTableFile" to experimentalApisTableFile.get(),
209+
"deprecatedApisTableFile" to deprecatedApisTableFile.get(),
210+
"standaloneConsoleLauncherShadowedArtifactsFile" to standaloneConsoleLauncherShadowedArtifactsFile.get(),
209211
"outdir" to outputDir.absolutePath,
210212
"source-highlighter" to "rouge",
211213
"tabsize" to "4",
@@ -215,7 +217,8 @@ tasks {
215217
"idprefix" to "",
216218
"idseparator" to "-",
217219
"jdk-javadoc-base-url" to jdkJavadocBaseUrl
218-
))
220+
)
221+
}
219222

220223
sourceSets["test"].apply {
221224
attributes(mapOf(

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pluginManagement {
1111
id("org.ajoberstar.git-publish") version "4.1.1"
1212
kotlin("jvm") version "1.5.31"
1313
// Check if workaround in documentation.gradle.kts can be removed when upgrading
14-
id("org.asciidoctor.jvm.convert") version "3.3.2"
15-
id("org.asciidoctor.jvm.pdf") version "3.3.2"
14+
id("org.asciidoctor.jvm.convert") version "4.0.0-alpha.1"
15+
id("org.asciidoctor.jvm.pdf") version "4.0.0-alpha.1"
1616
id("me.champeau.jmh") version "0.6.8"
1717
id("io.spring.nohttp") version "0.0.10"
1818
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"

0 commit comments

Comments
 (0)