From 9da4e53bbf6f9a40dcc20279769c824dd043e850 Mon Sep 17 00:00:00 2001
From: Jack Koenig <koenig@sifive.com>
Date: Fri, 22 Jan 2021 14:06:35 -0800
Subject: [PATCH] Bump to Scala 2.12.13 and 2.13.4 (#2053)

(cherry picked from commit e32309412f7da6e0e50f4aae23baa79e61857f9b)

# Conflicts:
#	build.sbt
---
 build.sbt           | 6 ++++++
 project/plugins.sbt | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 023374b05a..ef69f68e65 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,9 +20,15 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
 lazy val commonSettings = Seq(
   organization := "edu.berkeley.cs",
   name := "firrtl",
+<<<<<<< HEAD
   version := "1.4-SNAPSHOT",
   scalaVersion := "2.12.12",
   crossScalaVersions := Seq("2.13.2", "2.12.12", "2.11.12"),
+=======
+  version := "1.5-SNAPSHOT",
+  scalaVersion := "2.12.13",
+  crossScalaVersions := Seq("2.13.4", "2.12.13", "2.11.12"),
+>>>>>>> e3230941... Bump to Scala 2.12.13 and 2.13.4 (#2053)
   addCompilerPlugin(scalafixSemanticdb),
   scalacOptions := Seq(
     "-deprecation",
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3ed7accf48..888e09dab2 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,11 +18,11 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2")
 
 addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.5")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.25")
 
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")