Skip to content

Commit

Permalink
Add plugin 3.3.4 stub and change version to 3.3.4
Browse files Browse the repository at this point in the history
Update plugin dependency handling for Scala3
  • Loading branch information
adkian-sifive committed Dec 12, 2024
1 parent ff796bc commit 30d797f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
$CHISEL_FIRTOOL_PATH/firtool -version >> $GITHUB_STEP_SUMMARY
echo \`\`\` >> $GITHUB_STEP_SUMMARY
- name: Compile with Mill
run: ./mill chisel[3.3.3].compile
run: ./mill chisel[3.3.4].compile

doc:
name: Formatting
Expand Down
13 changes: 10 additions & 3 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ object v extends Module {
val java21Min213 = 11
val minVersion = if (javaVersion > 11) java21Min213 else 0
val versions = minVersion to latest213
versions.map(v => s"2.13.$v").toSeq
val versionSeq = versions.map(v => s"2.13.$v").toSeq
versionSeq ++ Seq("3.3.4")
}

val scalaCrossVersions = Seq(
"2.13.15",
"3.3.3"
"3.3.4"
)

def isScala3(ver: String): Boolean = ver.startsWith("3.")
Expand Down Expand Up @@ -310,7 +311,13 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule
def scalaReflectIvy = v.scalaReflect(crossScalaVersion)
def scalaCompilerIvy: Dep = v.scalaCompiler(crossScalaVersion)

def ivyDeps = super.ivyDeps() ++ Agg(scalaLibraryIvy, scalaReflectIvy, scalaCompilerIvy)
def ivyDeps = T {
if (!v.isScala3(crossScalaVersion)) {
super.ivyDeps() ++ Agg(scalaLibraryIvy, scalaReflectIvy, scalaCompilerIvy)
} else {
super.ivyDeps()
}
}
}

object chisel extends Cross[Chisel](v.scalaCrossVersions)
Expand Down

0 comments on commit 30d797f

Please sign in to comment.