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 1616
1717org.gradle.daemon =true
1818org.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
2121runOnceTasks =clean,release
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments