Skip to content

Commit 89d6887

Browse files
committed
Modernize Antora Build
1 parent c7391d2 commit 89d6887

File tree

5 files changed

+19
-31
lines changed

5 files changed

+19
-31
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ exportToHtml
1818
.rulesets
1919
.gradletasknamecache
2020
*.iml
21-
.idea
21+
.idea
22+
node_modules/

build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ ext {
140140

141141
// Antora
142142
antoraPluginVersion = '1.0.0'
143-
antoraVersion = '3.2.0-alpha.4'
144-
antoraAtlasExtensionVersion = '1.0.0-alpha.1'
145-
antoraPdfExtensionVersion = '1.0.0-alpha.7'
146-
antoraCollectorExtensionVersion = '1.0.0-alpha.3'
147-
asciiDocTabVersion = '1.0.0-beta.6'
148-
springIoAntoraExtensionsVersion = '1.8.2'
149-
springIoAsciidoctorExtensionsVersion = '1.0.0-alpha.9'
150143

151144
javadocLinks = ["https://docs.oracle.com/javase/8/docs/api/",
152145
// Use Reactive Streams 1.0.3 version for javadoc generation

docs/antora-playbook.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
antora:
22
extensions:
3-
- '@springio/antora-extensions/partial-build-extension'
4-
# atlas-extension must be before latest-version-extension so latest versions are applied to imported versions
5-
- '@antora/atlas-extension'
6-
- require: '@springio/antora-extensions/latest-version-extension'
7-
- require: '@springio/antora-extensions/inject-collector-cache-config-extension'
8-
- '@antora/collector-extension'
93
- id: pdf-extension # pdf-extension is enabled from antora-docs.gradle
104
require: '@antora/pdf-extension'
115
enabled: false
12-
- require: '@springio/antora-extensions/root-component-extension'
6+
- require: '@springio/antora-extensions'
137
root_component_name: 'reactor-netty'
148
site:
159
title: Reactor Netty Reference Guide
16-
url: https://projectreactor.io/docs/netty/release/reference/
10+
url: https://projectreactor.io/docs/netty/milestone/reference/
1711
content:
1812
sources:
1913
- url: ./..
@@ -24,6 +18,7 @@ asciidoc:
2418
extensions:
2519
- '@asciidoctor/tabs'
2620
- '@springio/asciidoctor-extensions'
21+
- '@springio/asciidoctor-extensions/include-code-extension'
2722
attributes:
2823
page-stackoverflow-url: https://stackoverflow.com/tags/reactor-netty
2924
page-pagination: ''

docs/package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"dependencies": {
3+
"antora": "3.2.0-alpha.4",
4+
"@antora/atlas-extension": "1.0.0-alpha.2",
5+
"@antora/collector-extension": "1.0.0-alpha.3",
6+
"@antora/pdf-extension": "1.0.0-alpha.7",
7+
"@asciidoctor/tabs": "1.0.0-beta.6",
8+
"@springio/antora-extensions": "1.11.1",
9+
"@springio/asciidoctor-extensions": "1.0.0-alpha.10"
10+
}
11+
}

gradle/antora-docs.gradle

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ def isCommandAvailable(String command) {
2626
}
2727

2828
antora {
29-
version = "$antoraVersion"
30-
playbook = findProperty('antora.playbook') ?: "antora-playbook.yml"
31-
options = ['--clean', '--stacktrace']
29+
options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
3230

3331
def version = project.version
3432
def forcePdf = project.hasProperty('forcePdf')
@@ -43,18 +41,8 @@ antora {
4341
}
4442

4543
environment = [
46-
'ALGOLIA_API_KEY' : 'd4bf9918bfc7d63ae68fbf92d69c2f49',
47-
'ALGOLIA_APP_ID' : '82SNR5M8HE',
48-
'ALGOLIA_INDEX_NAME': 'projectreactor'
49-
]
50-
51-
dependencies = [
52-
'@antora/atlas-extension' : "$antoraAtlasExtensionVersion",
53-
'@antora/pdf-extension' : "$antoraPdfExtensionVersion",
54-
'@antora/collector-extension' : "$antoraCollectorExtensionVersion",
55-
'@asciidoctor/tabs' : "$asciiDocTabVersion",
56-
'@springio/antora-extensions' : "$springIoAntoraExtensionsVersion",
57-
'@springio/asciidoctor-extensions': "$springIoAsciidoctorExtensionsVersion"
44+
'BUILD_REFNAME': 'HEAD',
45+
'BUILD_VERSION': project.version,
5846
]
5947
}
6048

0 commit comments

Comments
 (0)