Skip to content

Commit fc744c4

Browse files
committed
Cross compile generate-reference-doc on Scala 3 LTS & Next
1 parent 1d0b07c commit fc744c4

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,9 +975,9 @@ jobs:
975975
jvm: "temurin:17"
976976
- name: Check that reference doc is up-to-date
977977
run: |
978-
./mill -i generate-reference-doc.run --check || (
978+
./mill -i 'generate-reference-doc[]'.run --check || (
979979
echo "Reference doc is not up-to-date. Run"
980-
echo " ./mill -i generate-reference-doc.run"
980+
echo " ./mill -i 'generate-reference-doc[]'.run"
981981
echo "to update it, then commit the result."
982982
exit 1
983983
)

.scala-steward.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ updates.ignore = [
33
{ groupId = "com.github.plokhotnyuk.jsoniter-scala", artifactId="jsoniter-scala-core", version="2.13.5.2" }
44
]
55
postUpdateHooks = [{
6-
command = ["./mill", "-i", "generate-reference-doc.run"],
6+
command = ["./mill", "-i", "'generate-reference-doc[]'.run"],
77
commitMessage = "Generate the reference doc"
88
}]

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ will save you from getting a load of comments and speed up the code review.
4747
- ensure everything compiles at every commit (`./mill -i __.compile`);
4848
- ensure everything is well formatted at every commit (`scala-cli fmt .` or `scalafmt`);
4949
- ensure imports are well-ordered at every commit (`./mill -i __.fix`);
50-
- ensure reference docs are up-to date at every commit (`./mill -i generate-reference-doc.run`);
50+
- ensure reference docs are up-to date at every commit (`./mill -i 'generate-reference-doc[]'.run`);
5151
- ensure all tests pass at every commit (refer to the [dev docs](DEV.md) on how to run tests);
5252
- nobody expects you to run all the unit and integration tests for all platforms locally, that'd take too long;
5353
- just make sure the test suites relevant to your changes pass on your local machine.

build.sc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ object integration extends CliIntegration {
132132
}
133133
}
134134

135-
object `docs-tests` extends Cross[DocsTests](Scala.allScala3){
135+
object `docs-tests` extends Cross[DocsTests](Scala.allScala3) {
136136
def defaultCrossSegments = Seq(Scala.defaultInternal)
137137
}
138138

@@ -180,10 +180,13 @@ object packager extends ScalaModule with Bloop.Module {
180180
def mainClass = Some("packager.cli.PackagerCli")
181181
}
182182

183-
object `generate-reference-doc` extends SbtModule with ScalaCliScalafixModule {
184-
def scalaVersion = Scala.defaultInternal
183+
object `generate-reference-doc` extends Cross[GenerateReferenceDoc](Scala.allScala3) {
184+
def defaultCrossSegments = Seq(Scala.defaultInternal)
185+
}
186+
187+
trait GenerateReferenceDoc extends CrossSbtModule with ScalaCliScalafixModule {
185188
def moduleDeps = Seq(
186-
cli(Scala.defaultInternal)
189+
cli(crossScalaVersion)
187190
)
188191
def repositoriesTask = T.task(super.repositoriesTask() ++ customRepositories)
189192
def ivyDeps = Agg(

0 commit comments

Comments
 (0)