From 30d797fc13f598d3355f169d95835810a96ebd58 Mon Sep 17 00:00:00 2001
From: Aditya Naik <aditya.naik@sifive.com>
Date: Wed, 11 Dec 2024 17:31:59 -0800
Subject: [PATCH] Add plugin 3.3.4 stub and change version to 3.3.4

Update plugin dependency handling for Scala3
---
 .github/workflows/test.yml |  2 +-
 build.sc                   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1837c4054..393389f2f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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
diff --git a/build.sc b/build.sc
index 6fe8c884fb..a8630e56cd 100644
--- a/build.sc
+++ b/build.sc
@@ -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.")
@@ -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)