From 445b5cecb267adcd556627ffea2486b20740d6d4 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Mon, 1 Feb 2021 12:44:24 -0800 Subject: Bump to Scala 2.12.13 (#1766) --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index c37b748b..78b9307e 100644 --- a/build.sc +++ b/build.sc @@ -5,7 +5,7 @@ import coursier.maven.MavenRepository import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo -object chisel3 extends mill.Cross[chisel3CrossModule]("2.12.12") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.12.13") // The following stanza is searched for and used when preparing releases. // Please retain it. -- cgit v1.2.3 From 8be86e461b9d9a6198c8153b3badda568af8be61 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Apr 2021 06:59:24 +0200 Subject: Update scopt to 4.0.1 (#1815) Co-authored-by: Jiuyang Liu Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 78b9307e..80a96fa0 100644 --- a/build.sc +++ b/build.sc @@ -107,7 +107,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def ivyDeps = m.ivyDeps() ++ Agg( ivy"org.scalatest::scalatest:3.1.2", ivy"org.scalatestplus::scalacheck-1-14:3.1.1.1", - ivy"com.github.scopt::scopt:3.7.1" + ivy"com.github.scopt::scopt:4.0.1" ) ++ m.treadleIvyDeps override def moduleDeps = super.moduleDeps ++ treadleModule -- cgit v1.2.3 From 987e58f83996241aca6aa5f87395481184950436 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 May 2021 08:57:50 +0200 Subject: Update scalacheck-1-14, ... to 3.1.4.0 (#1575) * Update scalacheck-1-14, ... to 3.1.4.0 * Update scalacheck-1-14, ... to 3.1.4.0 * Update scalacheck-1-14 to 3.1.4.0 Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 80a96fa0..7e0a8019 100644 --- a/build.sc +++ b/build.sc @@ -106,7 +106,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def ivyDeps = m.ivyDeps() ++ Agg( ivy"org.scalatest::scalatest:3.1.2", - ivy"org.scalatestplus::scalacheck-1-14:3.1.1.1", + ivy"org.scalatestplus::scalacheck-1-14:3.1.4.0", ivy"com.github.scopt::scopt:4.0.1" ) ++ m.treadleIvyDeps -- cgit v1.2.3 From 46b522df7a9162b073a1fe8453cdce891d86b802 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 12 May 2021 11:40:20 +0200 Subject: Update scalacheck-1-14 to 3.2.2.0 (#1908) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 7e0a8019..7ec6d23b 100644 --- a/build.sc +++ b/build.sc @@ -106,7 +106,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def ivyDeps = m.ivyDeps() ++ Agg( ivy"org.scalatest::scalatest:3.1.2", - ivy"org.scalatestplus::scalacheck-1-14:3.1.4.0", + ivy"org.scalatestplus::scalacheck-1-14:3.2.2.0", ivy"com.github.scopt::scopt:4.0.1" ) ++ m.treadleIvyDeps -- cgit v1.2.3 From 761447a2d88563e2b6c0a5a538abd4a2ebf70620 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Mon, 17 May 2021 18:52:30 +0000 Subject: remove scopt dependency. (#1917) --- build.sc | 1 - 1 file changed, 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 7ec6d23b..35921d8a 100644 --- a/build.sc +++ b/build.sc @@ -107,7 +107,6 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def ivyDeps = m.ivyDeps() ++ Agg( ivy"org.scalatest::scalatest:3.1.2", ivy"org.scalatestplus::scalacheck-1-14:3.2.2.0", - ivy"com.github.scopt::scopt:4.0.1" ) ++ m.treadleIvyDeps override def moduleDeps = super.moduleDeps ++ treadleModule -- cgit v1.2.3 From 8c9007365d038d23b94bb4d1a6a7f20448f951eb Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 20 May 2021 03:09:24 +0000 Subject: implement model checking API for chiseltest (#1910) * add os-lib to dependency. * implement EndToEndSMTBaseSpec * rename to SMTModelCheckingSpec * add documentation. * fix for review.--- build.sc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 35921d8a..dbfe2438 100644 --- a/build.sc +++ b/build.sc @@ -44,7 +44,9 @@ trait CommonModule extends CrossSbtModule with PublishModule { override def moduleDeps = super.moduleDeps ++ firrtlModule - override def ivyDeps = super.ivyDeps() ++ firrtlIvyDeps + override def ivyDeps = super.ivyDeps() ++ Agg( + ivy"com.lihaoyi::os-lib:0.7.7", + ) ++ firrtlIvyDeps def publishVersion = "3.5-SNAPSHOT" -- cgit v1.2.3 From 3e65fb78769c8e4f7b737b021c6bbb52d1d7b7af Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Wed, 26 May 2021 01:29:25 +0800 Subject: make mill support 2.13. (#1934) --- build.sc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index dbfe2438..bd5a3944 100644 --- a/build.sc +++ b/build.sc @@ -5,7 +5,7 @@ import coursier.maven.MavenRepository import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo -object chisel3 extends mill.Cross[chisel3CrossModule]("2.12.13") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.13") // The following stanza is searched for and used when preparing releases. // Please retain it. @@ -62,14 +62,14 @@ trait CommonModule extends CrossSbtModule with PublishModule { super.scalacOptions() ++ Agg( "-deprecation", "-feature" - ) + ) ++ (if (majorVersion == 13) Agg("-Ymacro-annotations") else Agg.empty[String]) } private val macroParadise = ivy"org.scalamacros:::paradise:2.1.1" - override def compileIvyDeps = Agg(macroParadise) + override def compileIvyDeps = if(majorVersion == 13) super.compileIvyDeps else Agg(macroParadise) - override def scalacPluginIvyDeps = Agg(macroParadise) + override def scalacPluginIvyDeps = if(majorVersion == 13) super.compileIvyDeps else Agg(macroParadise) def pomSettings = PomSettings( description = artifactName(), @@ -179,8 +179,8 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def firrtlModule = m.firrtlModule override def ivyDeps = Agg( - ivy"${scalaOrganization()}:scala-library:$crossScalaVersion" - ) + ivy"${scalaOrganization()}:scala-library:$crossScalaVersion", + ) ++ (if (majorVersion == 13) Agg(ivy"${scalaOrganization()}:scala-compiler:$crossScalaVersion") else Agg.empty[Dep]) def scalacOptions = T { Seq( -- cgit v1.2.3 From 461691810094f5ca6722f9e5bbd3a1304cec36fd Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Sat, 29 May 2021 06:27:08 +0800 Subject: remove testOnly, since upstream implemented it. (#1946) --- build.sc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index bd5a3944..59f30c79 100644 --- a/build.sc +++ b/build.sc @@ -116,12 +116,6 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit def testFrameworks = T { Seq("org.scalatest.tools.Framework") } - - // a sbt-like testOnly command. - // for example, mill -i "chisel3[2.12.12].test.testOnly" "chiselTests.BitwiseOpsSpec" - def testOnly(args: String*) = T.command { - super.runMain("org.scalatest.run", args: _*) - } } override def buildInfoPackageName = Some("chisel3") -- cgit v1.2.3 From 682c73d0021c07c62aa4daf6548088e136490204 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 4 Jun 2021 13:58:20 +0200 Subject: Update os-lib to 0.7.8 (#1949) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 59f30c79..8c5a258d 100644 --- a/build.sc +++ b/build.sc @@ -45,7 +45,7 @@ trait CommonModule extends CrossSbtModule with PublishModule { override def moduleDeps = super.moduleDeps ++ firrtlModule override def ivyDeps = super.ivyDeps() ++ Agg( - ivy"com.lihaoyi::os-lib:0.7.7", + ivy"com.lihaoyi::os-lib:0.7.8", ) ++ firrtlIvyDeps def publishVersion = "3.5-SNAPSHOT" -- cgit v1.2.3 From 942218432a80de1546ed53a4cfb10a8683ff4f27 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Mon, 21 Jun 2021 16:58:15 -0700 Subject: Bump scalatest to 3.2.9 (#1965) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 8c5a258d..19ddc7ed 100644 --- a/build.sc +++ b/build.sc @@ -107,7 +107,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def scalacPluginClasspath = m.scalacPluginClasspath override def ivyDeps = m.ivyDeps() ++ Agg( - ivy"org.scalatest::scalatest:3.1.2", + ivy"org.scalatest::scalatest:3.2.9", ivy"org.scalatestplus::scalacheck-1-14:3.2.2.0", ) ++ m.treadleIvyDeps -- cgit v1.2.3 From c66f0ed24366f8ce0e20a5a420589b8ae01aba77 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 14 Sep 2021 00:50:37 +0200 Subject: Update scala-compiler, scala-library, ... to 2.12.14 (#1950) --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 19ddc7ed..b83f4bdd 100644 --- a/build.sc +++ b/build.sc @@ -5,7 +5,7 @@ import coursier.maven.MavenRepository import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo -object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.13") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.14") // The following stanza is searched for and used when preparing releases. // Please retain it. -- cgit v1.2.3