Skip to content

Commit 898f024

Browse files
authored
Fix GitHub Pages publishing (#55)
1 parent da80c4a commit 898f024

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed

build.gradle

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
buildscript {
22
repositories {
33
mavenCentral()
4-
maven { url "https://plugins.gradle.org/m2/" }
4+
maven {
5+
url "https://plugins.gradle.org/m2/"
6+
}
7+
maven {
8+
name = 'ajoberstar-backup'
9+
url = 'https://ajoberstar.org/bintray-backup/'
10+
}
511
}
612
dependencies {
713
classpath "org.asciidoctor:asciidoctor-maven-plugin:${project.asciiDoctorMavenPluginVersion}"
@@ -25,14 +31,15 @@ repositories {
2531
maven {
2632
url "https://oss.sonatype.org/content/repositories/snapshots"
2733
}
34+
maven { url 'https://jitpack.io' }
2835
}
2936

3037
dependencies {
31-
testCompile "io.vavr:vavr:${project.version}"
32-
testCompile "junit:junit:4.11"
33-
testCompile "org.assertj:assertj-core:3.0.0"
34-
testCompile "ch.qos.logback:logback-classic:0.9.26"
35-
testCompile "org.mockito:mockito-core:1.10.19"
38+
testImplementation "io.vavr:vavr:${project.version}"
39+
testImplementation "junit:junit:4.11"
40+
testImplementation "org.assertj:assertj-core:3.0.0"
41+
testImplementation "ch.qos.logback:logback-classic:0.9.26"
42+
testImplementation "org.mockito:mockito-core:1.10.19"
3643
}
3744

3845
compileJava {
@@ -51,14 +58,18 @@ asciidoctor {
5158
sourceDir = file('src/docs/asciidoc')
5259
outputDir = file("$buildDir/docs/asciidoc")
5360

61+
options backend: 'html5'
62+
5463
baseDirFollowsSourceDir()
5564

65+
attributes(
66+
'project-version': project.version
67+
)
68+
5669
sources {
5770
include 'index.adoc'
5871
}
59-
outputOptions {
60-
backends = ['html5']
61-
}
72+
6273
resources {
6374
from(sourceDir) {
6475
include 'images/**'
@@ -72,7 +83,7 @@ tasks.withType(Copy).configureEach {
7283

7384
tasks.register('copyCNAME', Copy) {
7485
from 'CNAME'
75-
into file(asciidoctor.outputDir.path + '/html5')
86+
into file(asciidoctor.outputDir.path)
7687
}
7788

7889
//asciidoctor.dependsOn test
@@ -88,7 +99,7 @@ githubPages {
8899
}
89100

90101
pages {
91-
from file(asciidoctor.outputDir.path + '/html5')
102+
from file(asciidoctor.outputDir.path)
92103
// into project.version
93104
}
94105
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
asciiDoctorMavenPluginVersion=2.2.6
22
asciiDoctorJPdfVersion=1.5.0-alpha.10
3-
gradleGitVersion=1.3.2
3+
gradleGitVersion=1.7.2
44
livereloadGradlePluginVersion=0.2.1
55
asciidoctorGradleJvm=2.4.0
66
asciidoctorGradleBase=2.4.0

src/docs/asciidoc/license.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
== License
22

3-
Copyright 2014-2018 Vavr, http://vavr.io
3+
Copyright 2014-2018 Vavr, https://vavr.io
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)