File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 16
16
17
17
org.gradle.daemon =true
18
18
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
21
21
runOnceTasks =clean,release
Original file line number Diff line number Diff line change @@ -123,7 +123,12 @@ configure(scalaProjects) { project ->
123
123
124
124
task scaladocJar(type : Jar ) {
125
125
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
+ }
127
132
}
128
133
129
134
publishing {
@@ -132,9 +137,7 @@ configure(scalaProjects) { project ->
132
137
artifactId = project. archivesBaseName. contains(' bson' ) ? ' mongo-scala-bson' : ' mongo-scala-driver'
133
138
from project. components. java
134
139
artifact sourcesJar
135
- if (! scalaVersion. startsWith(" 2.13" )) {
136
- artifact scaladocJar // https://github.com/gradle/gradle/issues/9855
137
- }
140
+ artifact scaladocJar
138
141
}
139
142
}
140
143
You can’t perform that action at this time.
0 commit comments