Merge branch '1.3.x' into 1.3-release

freechipsproject · May 15, 2020 · ecab911 · ecab911
2 parents bd9bb1e + 8d41c62
commit ecab911
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.scala-steward.conf b/.scala-steward.conf
@@ -1 +1,2 @@
 updates.ignore = [ { groupId = "edu.berkeley.cs", artifactId = "firrtl" } ]
+pullRequests.frequency = "0 0 1 * *" # The first of every month
diff --git a/build.sbt b/build.sbt
@@ -75,7 +75,7 @@ libraryDependencies ++= (Seq("firrtl").map {
 // An explicit dependency on junit seems to alleviate this.
 libraryDependencies ++= Seq(
   "junit" % "junit" % "4.13" % "test",
-  "org.scalatest" %% "scalatest" % "3.1.1" % "test",
+  "org.scalatest" %% "scalatest" % "3.1.2" % "test",
   "org.scalacheck" %% "scalacheck" % "1.14.3" % "test",
   "org.scala-lang.modules" % "scala-jline" % "2.12.1"
 )

diff --git a/build.sc b/build.sc
@@ -87,7 +87,7 @@ class FirrtlInterpreterModule(val crossScalaVersion: String) extends CommonModul
 
   object test extends Tests {
     override def ivyDeps = Agg(
-      ivy"org.scalatest::scalatest:3.1.1",
+      ivy"org.scalatest::scalatest:3.1.2",
       ivy"org.scalacheck::scalacheck:1.14.3"
     )
     def testFrameworks = Seq("org.scalatest.tools.Framework")
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		updates.ignore = [ { groupId = "edu.berkeley.cs", artifactId = "firrtl" } ]
		pullRequests.frequency = "0 0 1 * *" # The first of every month