Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mill from 0.11.5 to 0.12.5 #133

Merged
merged 6 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/template-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

# Replace placeholders
sed -i "s/%NAME%/$NAME/g" build.sbt README.md src/test/scala/gcd/*
sed -i "s/%NAME%/$WRAPPED_NAME/g" build.sc
sed -i "s/%NAME%/$WRAPPED_NAME/g" build.mill
sed -i "s/%REPOSITORY%/${GITHUB_REPOSITORY/\//\\/}/g" README.md
sed -i "s/%ORGANIZATION%/$GROUP/g" build.sbt

Expand Down
1 change: 1 addition & 0 deletions .mill-jvm-opts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dchisel.project.root=${PWD}
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.5
0.12.5
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ with a clean running [Chisel3](https://www.chisel-lang.org/) project.

### Dependencies

#### JDK 8 or newer
#### JDK 11 or newer

We recommend LTS releases Java 8 and Java 11. You can install the JDK as your operating system recommends, or use the prebuilt binaries from [AdoptOpenJDK](https://adoptopenjdk.net/).
We recommend using Java 11 or later LTS releases. While Chisel itself works with Java 8, our preferred build tool Mill requires Java 11. You can install the JDK as your operating system recommends, or use the prebuilt binaries from [Adoptium](https://adoptium.net/) (formerly AdoptOpenJDK).

#### SBT or mill

Expand Down
10 changes: 8 additions & 2 deletions build.sc → build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@ import scalalib._
// support BSP
import mill.bsp._

// Note: This project requires .mill-jvm-opts file containing:
// -Dchisel.project.root=${PWD}
// This is needed because Chisel needs to know the project root directory
// to properly generate and handle test directories and output files.
// See: https://github.com/com-lihaoyi/mill/issues/3840

object %NAME% extends SbtModule { m =>
override def millSourcePath = os.pwd
override def millSourcePath = super.millSourcePath / os.up
override def scalaVersion = "2.13.15"
override def scalacOptions = Seq(
"-language:reflectiveCalls",
Expand All @@ -22,7 +28,7 @@ object %NAME% extends SbtModule { m =>
override def scalacPluginIvyDeps = Agg(
ivy"org.chipsalliance:::chisel-plugin:6.6.0",
)
object test extends SbtModuleTests with TestModule.ScalaTest {
object test extends SbtTests with TestModule.ScalaTest {
override def ivyDeps = m.ivyDeps() ++ Agg(
ivy"org.scalatest::scalatest::3.2.16"
)
Expand Down
Loading