Skip to content

Commit 0dcc976

Browse files
committedMay 30, 2021
chore: fix dokka and ci build cache
1 parent 5d1ee4f commit 0dcc976

File tree

3 files changed

+119
-11
lines changed

3 files changed

+119
-11
lines changed
 

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ publish:
1717
script:
1818
- ./gradlew --build-cache publish
1919
cache:
20-
key: "$ci_commit_ref_name"
20+
key: "$CI_COMMIT_REF_NAME"
2121
policy: pull
2222
paths:
2323
- build

‎.gradletasknamecache

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
assemble
2+
build
3+
buildDependents
4+
buildNeeded
5+
classes
6+
clean
7+
jar
8+
testClasses
9+
init
10+
wrapper
11+
dokkaGfm
12+
dokkaHtml
13+
dokkaJavadoc
14+
dokkaJekyll
15+
javadoc
16+
buildEnvironment
17+
dependencies
18+
dependencyInsight
19+
help
20+
javaToolchains
21+
kotlinDslAccessorsReport
22+
outgoingVariants
23+
projects
24+
properties
25+
tasks
26+
generateMetadataFileForMavenPublication
27+
generatePomFileForMavenPublication
28+
publish
29+
publishAllPublicationsToMavenRepository
30+
publishMavenPublicationToMavenLocal
31+
publishMavenPublicationToMavenRepository
32+
publishToMavenLocal
33+
knows
34+
shadowJar
35+
check
36+
test
37+
printVersion
38+
compileJava
39+
compileKotlin
40+
compileTestJava
41+
compileTestKotlin
42+
components
43+
dependentComponents
44+
deployPlugin
45+
dokkaJar
46+
inspectClassesForKotlinIC
47+
javadocJar
48+
kotlinSourcesJar
49+
mainClasses
50+
model
51+
prepareKotlinBuildScriptModel
52+
processResources
53+
processTestResources
54+
sourcesJar
55+
Pattern:
56+
Pattern:
57+
assemble
58+
build
59+
buildDependents
60+
buildNeeded
61+
classes
62+
clean
63+
jar
64+
testClasses
65+
init
66+
wrapper
67+
dokkaGfm
68+
dokkaHtml
69+
dokkaJavadoc
70+
dokkaJekyll
71+
javadoc
72+
buildEnvironment
73+
dependencies
74+
dependencyInsight
75+
help
76+
javaToolchains
77+
kotlinDslAccessorsReport
78+
outgoingVariants
79+
projects
80+
properties
81+
tasks
82+
generateMetadataFileForMavenPublication
83+
generatePomFileForMavenPublication
84+
publish
85+
publishAllPublicationsToMavenRepository
86+
publishMavenPublicationToMavenLocal
87+
publishMavenPublicationToMavenRepository
88+
publishToMavenLocal
89+
knows
90+
shadowJar
91+
check
92+
test
93+
printVersion
94+
compileJava
95+
compileKotlin
96+
compileTestJava
97+
compileTestKotlin
98+
components
99+
dependentComponents
100+
deployPlugin
101+
dokkaJar
102+
inspectClassesForKotlinIC
103+
javadocJar
104+
kotlinSourcesJar
105+
mainClasses
106+
model
107+
prepareKotlinBuildScriptModel
108+
processResources
109+
processTestResources
110+
sourcesJar

‎build.gradle.kts

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2-
import org.jetbrains.dokka.gradle.DokkaTask
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43
import java.net.URI
54

@@ -12,8 +11,8 @@ plugins {
1211
`maven-publish`
1312
signing
1413
kotlin("jvm") version "1.5.10"
15-
id("com.github.johnrengelman.shadow") version "5.0.0"
16-
id("org.jetbrains.dokka") version "0.10.0"
14+
id("com.github.johnrengelman.shadow") version "5.2.0"
15+
id("org.jetbrains.dokka") version "1.4.32"
1716
id("com.palantir.git-version") version "0.12.3"
1817
}
1918

@@ -82,13 +81,12 @@ dependencies {
8281

8382
compileOnly("org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT")
8483
}
85-
val dokka = (tasks["dokka"] as DokkaTask).apply {
86-
outputFormat = "html"
84+
85+
val dokkaHtml = tasks.dokkaHtml.apply {
8786
}
8887

89-
val dokkaJavadoc by tasks.registering(DokkaTask::class) {
90-
outputFormat = "javadoc"
91-
outputDirectory = "$buildDir/javadoc"
88+
val dokkaJavadoc = tasks.dokkaJavadoc {
89+
outputDirectory.set(buildDir.resolve("javadoc"))
9290
}
9391

9492
gradle.taskGraph.whenReady {
@@ -120,9 +118,9 @@ val shadowJar = (tasks["shadowJar"] as ShadowJar).apply {
120118
}
121119

122120
val dokkaJar by tasks.registering(Jar::class) {
123-
dependsOn(dokka)
121+
dependsOn(dokkaHtml)
124122
archiveClassifier.set("dokka")
125-
from(tasks.dokka)
123+
from(tasks.dokkaHtml)
126124
}
127125

128126
val deployPlugin by tasks.registering(Copy::class) {

0 commit comments

Comments
 (0)
Please sign in to comment.