File tree Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Expand file tree Collapse file tree 2 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -170,7 +170,7 @@ jobs:
170170 $CHISEL_FIRTOOL_PATH/firtool -version >> $GITHUB_STEP_SUMMARY
171171 echo \`\`\` >> $GITHUB_STEP_SUMMARY
172172 - name : Compile with Mill
173- run : ./mill chisel[3.3.3 ].compile
173+ run : ./mill chisel[3.3.4 ].compile
174174
175175 doc :
176176 name : Formatting
Original file line number Diff line number Diff line change @@ -34,12 +34,13 @@ object v extends Module {
3434 val java21Min213 = 11
3535 val minVersion = if (javaVersion > 11 ) java21Min213 else 0
3636 val versions = minVersion to latest213
37- versions.map(v => s " 2.13. $v" ).toSeq
37+ val versionSeq = versions.map(v => s " 2.13. $v" ).toSeq
38+ versionSeq ++ Seq (" 3.3.4" )
3839 }
3940
4041 val scalaCrossVersions = Seq (
4142 " 2.13.15" ,
42- " 3.3.3 "
43+ " 3.3.4 "
4344 )
4445
4546 def isScala3 (ver : String ): Boolean = ver.startsWith(" 3." )
@@ -310,7 +311,13 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule
310311 def scalaReflectIvy = v.scalaReflect(crossScalaVersion)
311312 def scalaCompilerIvy : Dep = v.scalaCompiler(crossScalaVersion)
312313
313- def ivyDeps = super .ivyDeps() ++ Agg (scalaLibraryIvy, scalaReflectIvy, scalaCompilerIvy)
314+ def ivyDeps = T {
315+ if (! v.isScala3(crossScalaVersion)) {
316+ super .ivyDeps() ++ Agg (scalaLibraryIvy, scalaReflectIvy, scalaCompilerIvy)
317+ } else {
318+ super .ivyDeps()
319+ }
320+ }
314321}
315322
316323object chisel extends Cross [Chisel ](v.scalaCrossVersions)
You can’t perform that action at this time.
0 commit comments