Merge commit 'c1b58fdc' into 3.1.0

ucbjrl · ucbjrl · commit 198310841a70 · 2018-04-17T09:23:51.000-07:00
diff --git a/build.sbt b/build.sbt
@@ -30,11 +30,11 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
   }
 }
 
-val defaultVersions = Map("firrtl" -> "1.1.0-RC2")
+val defaultVersions = Map("firrtl" -> "1.1.0")
 
 lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
-  version := "3.1.0-RC2",
+  version := "3.1.0",
   git.remoteRepo := "git@github.com:freechipsproject/chisel3.git",
   autoAPIMappings := true,
   scalaVersion := "2.11.12",

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-val defaultVersions = Map("firrtl" -> "1.1.0-RC2")`
	`33`	`+val defaultVersions = Map("firrtl" -> "1.1.0")`
`34`	`34`
`35`	`35`	`lazy val commonSettings = Seq (`
`36`	`36`	`organization := "edu.berkeley.cs",`
`37`		`- version := "3.1.0-RC2",`
	`37`	`+ version := "3.1.0",`
`38`	`38`	`git.remoteRepo := "git@github.com:freechipsproject/chisel3.git",`
`39`	`39`	`autoAPIMappings := true,`
`40`	`40`	`scalaVersion := "2.11.12",`