From c63a599028ea7af0014fae450d0b79c096197005 Mon Sep 17 00:00:00 2001
From: REDNBLACK <boris.p@protonmail.com>
Date: Thu, 22 Oct 2020 07:06:33 +0300
Subject: [PATCH] Update Scala version in sbt and GH Workflows

---
 .github/workflows/scala.yml |  2 +-
 build.sbt                   | 15 +++++++++------
 project/Version.scala       |  4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 7f59bd4b..73c1d094 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.11, 2.13.2]
+        scala: [2.12.12, 2.13.3]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/build.sbt b/build.sbt
index 1e5eea1b..58ebf4b4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,7 +37,10 @@ developers in ThisBuild := List(
 
 val minorVersion = SettingKey[Int]("minor scala version")
 
-val crossCompile = crossScalaVersions := List("2.13.2", "2.12.11")
+val scala212V = "2.12.12"
+val scala213V = "2.13.3"
+
+val crossCompile = crossScalaVersions := List(scala212V, scala213V)
 
 val commonScalacOptions = scalacOptions ++= List(
   "-deprecation",
@@ -65,12 +68,12 @@ val setMinorVersion = minorVersion := {
 
 lazy val compilerPlugins = libraryDependencies ++= List(
   compilerPlugin("org.typelevel" %% "kind-projector"     % Version.kindProjector),
-  compilerPlugin("com.olegpy"    %% "better-monadic-for" % "0.3.1"),
+  compilerPlugin("com.olegpy"    %% "better-monadic-for" % Version.bm4),
 )
 
 val paradise = libraryDependencies ++= {
   minorVersion.value match {
-    case 12 => List(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.patch))
+    case 12 => List(compilerPlugin("org.scalamacros" % "paradise" % Version.macroParadise cross CrossVersion.patch))
     case 13 => List()
   }
 }
@@ -132,7 +135,7 @@ val swaggerUIVersion = SettingKey[String]("swaggerUIVersion")
 lazy val testLibs = libraryDependencies ++= scalatest :: scalacheck :: scalatestScalacheck :: Nil
 
 lazy val commonSettings = publishSettings ++ List(
-  scalaVersion := "2.13.2",
+  scalaVersion := scala213V,
   collectionCompat,
   compilerPlugins,
   commonScalacOptions,
@@ -311,7 +314,7 @@ lazy val docs = project
   .in(file("modules/docs"))
   .enablePlugins(ScalaUnidocPlugin)
   .settings(
-    scalaVersion := "2.13.2",
+    scalaVersion := scala213V,
     publish / skip := true,
     crossCompile,
     setMinorVersion,
@@ -324,7 +327,7 @@ lazy val typedschema =
     .dependsOn(macros, kernel, main)
     .settings(
       publish / skip := true,
-      scalaVersion := "2.13.2",
+      scalaVersion := scala213V,
       publishSettings,
       setMinorVersion,
       crossCompile
diff --git a/project/Version.scala b/project/Version.scala
index de1d80b3..675ce3bf 100644
--- a/project/Version.scala
+++ b/project/Version.scala
@@ -14,6 +14,10 @@ object Version {
 
   val kindProjector = "0.10.3"
 
+  val bm4 = "0.3.1"
+
+  val macroParadise = "2.1.1"
+
   val akkaHttpCirce = "1.35.0"
 
   val cats = "2.2.0"