Skip to content

Commit 85d1111

Browse files
committed
Add workaround for scaladoc generation in Scala 3 & additional update after revert
1 parent 53bdcc8 commit 85d1111

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

docs/plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ This Mill library provides a Mill module that can be used to generate code from
130130
```scala
131131
//| mill-version: 1.0.6
132132
//| mvnDeps:
133-
//| - org.openapitools:openapi-generator-mill-plugin:7.19.0 # 1.
133+
//| - org.openapitools:openapi-generator-mill-plugin:7.20.0 # 1.
134134

135135
import mill.*
136136

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# RELEASE_VERSION
2-
openApiGeneratorVersion=7.19.0
2+
openApiGeneratorVersion=7.20.0-SNAPSHOT
33
# /RELEASE_VERSION

modules/openapi-generator-mill-plugin/pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.openapitools</groupId>
55
<artifactId>openapi-generator-project</artifactId>
66
<!-- RELEASE_VERSION -->
7-
<version>7.19.0</version>
7+
<version>7.20.0-SNAPSHOT</version>
88
<!-- /RELEASE_VERSION -->
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
@@ -137,8 +137,29 @@
137137
<goals>
138138
<goal>compile</goal>
139139
<goal>testCompile</goal>
140+
</goals>
141+
</execution>
142+
<execution>
143+
<!-- see https://github.com/davidB/scala-maven-plugin/issues/604 why a workaround is needed -->
144+
<id>attach-javadocs</id>
145+
<goals>
140146
<goal>doc-jar</goal>
141147
</goals>
148+
<configuration>
149+
<scaladocClassName>dotty.tools.scaladoc.Main</scaladocClassName>
150+
<sourceDir>${project.build.outputDirectory}</sourceDir>
151+
<args>-nobootcp</args>
152+
<includes>
153+
<include>**/*.tasty</include>
154+
</includes>
155+
<dependencies>
156+
<dependency>
157+
<groupId>org.scala-lang</groupId>
158+
<artifactId>scaladoc_3</artifactId>
159+
<version>3.7.4</version>
160+
</dependency>
161+
</dependencies>
162+
</configuration>
142163
</execution>
143164
</executions>
144165
</plugin>

0 commit comments

Comments
 (0)