Skip to content

Commit fd94aaa

Browse files
committed
Build: Fix scaladoc 2.13
JAVA-3435
1 parent 2e429a6 commit fd94aaa

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
org.gradle.daemon=true
1818
org.gradle.jvmargs=-Duser.country=US -Duser.language=en
19-
scalaVersions=2.11.12,2.12.10,2.13.0
20-
defaultScalaVersions=2.13.0
19+
scalaVersions=2.11.12,2.12.10,2.13.1
20+
defaultScalaVersions=2.13.1
2121
runOnceTasks=clean,release

gradle/publish.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,12 @@ configure(scalaProjects) { project ->
123123

124124
task scaladocJar(type: Jar) {
125125
from scaladoc
126-
classifier = 'scaladoc'
126+
classifier = 'javadoc'
127+
128+
// Workaround for gradle 2.13 scaladoc issue: https://github.com/gradle/gradle/issues/9855
129+
if (project.scalaVersion.startsWith("2.13")) {
130+
project.scaladoc.scalaClasspath += files("$rootDir/gradle/scala/lib/scala-ant-2.13.1.jar")
131+
}
127132
}
128133

129134
publishing {
@@ -132,9 +137,7 @@ configure(scalaProjects) { project ->
132137
artifactId = project.archivesBaseName.contains('bson') ? 'mongo-scala-bson' : 'mongo-scala-driver'
133138
from project.components.java
134139
artifact sourcesJar
135-
if (!scalaVersion.startsWith("2.13")) {
136-
artifact scaladocJar // https://github.com/gradle/gradle/issues/9855
137-
}
140+
artifact scaladocJar
138141
}
139142
}
140143

gradle/scala/lib/scala-ant-2.13.1.jar

145 KB
Binary file not shown.

0 commit comments

Comments
 (0)