Skip to content

Commit 771db50

Browse files
committed
Fix documentation site generation.
1 parent 0a0ed7d commit 771db50

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

Diff for: core-plugin/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ gemResolverStrategy {
6363
excludeConfigurations 'foo', 'bar' // <1>
6464
excludeModule 'foo.*' // <2>
6565
excludeModule 'foo.*', /1\.2.*/ // <3>
66-
useGemVersionResolver 'gems2'
66+
useGemVersionResolver 'gems2' // <4>
6767
}
6868
----
6969
<1> Exclude configurations `foo` and `bar` from being considered for GEM resolver strategies.

Diff for: docs/_config/site.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
base_url: http://jruby-gradle.org/
22
local_tz: UTC
3-
haml:
4-
:ugly: true
3+
generation:
4+
:in_threads: 0
55
asciidoctor:
66
:safe: unsafe
77
:base_dir: null

Diff for: docs/build.gradle

+12-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
dependencies {
77
/* wow. so recursion */
8-
classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1"
8+
classpath "com.github.jruby-gradle:jruby-gradle-plugin:2.1.0-alpha.2"
99
}
1010
}
1111
apply plugin: 'groovy'
@@ -18,14 +18,18 @@ configurations {
1818
asciidoctor
1919
}
2020

21-
dependencies {
22-
asciidoctor('rubygems:awestruct:0.5.5')
23-
asciidoctor('rubygems:coderay:1.1.0')
21+
repositories {
22+
ruby.gems()
23+
}
2424

25-
/* later versions of 1.6.x have a dependency incompatibility with
26-
* mime-types 2.x
27-
*/
28-
asciidoctor('rubygems:rest-client:1.6.7') { force = true }
25+
dependencies {
26+
asciidoctor('rubygems:awestruct:0.6.6')
27+
asciidoctor('rubygems:coderay:1.1.3')
28+
asciidoctor('rubygems:http_parser.rb:0.6.0')
29+
asciidoctor('rubygems:public_suffix:4.0.7')
30+
asciidoctor('rubygems:spoon:0.0.6')
31+
asciidoctor('rubygems:htmlcompressor:0.4.0')
32+
asciidoctor('rubygems:uglifier:4.2.0')
2933
}
3034

3135
task prepareGroovyDocs(type: Copy) {

Diff for: docs/plugins/storm.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ documentation intends only to cover the JRuby Gradle plugin's functionality.
1616
[source,gradle]
1717
.build.gradle
1818
----
19-
include::../examples/basic-topology.gradle[]
19+
include::examples/basic-topology.gradle[]
2020
----
2121

2222

Diff for: examples/run-ruby-binscript/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
/* Using the built-in `gems` configuration to describe the
1818
* dependencies our JRubyExec-based tasks will need.
1919
*/
20-
gems "rubygems:asciidoctor:1.5.2+"
20+
gems "rubygems:asciidoctor:2.0.20+"
2121
}
2222

2323
task verifyAsciidoctorWorks(type: JRubyExec) {

0 commit comments

Comments
 (0)