Merge branch 'master' into update-enumeratum-circe_2.13

# Conflicts: # build.sbt
lloydmeta · Jul 5, 2019 · 2db555e · 2db555e
2 parents 5d0884e + fabfd5a
commit 2db555e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -42,7 +42,7 @@ def thePlayVersion(scalaVersion: String) =
 
 def theSlickVersion(scalaVersion: String) =
   CrossVersion.partialVersion(scalaVersion) match {
-    case Some((2, scalaMajor)) if scalaMajor >= 11 => "3.2.3"
+    case Some((2, scalaMajor)) if scalaMajor >= 11 => "3.3.2"
     case Some((2, scalaMajor)) if scalaMajor == 10 => "3.1.1"
     case _ =>
       throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
@@ -104,6 +104,7 @@ lazy val scala213ProjectRefs = Seq(
   enumeratumPlayJsonJs,
   enumeratumArgonautJs,
   enumeratumArgonautJvm,
+  enumeratumSlick,
   enumeratumPlay,
   enumeratumCirceJvm,
   enumeratumCirceJs,
@@ -445,7 +446,8 @@ lazy val enumeratumSlick =
     .settings(commonWithPublishSettings: _*)
     .settings(testSettings: _*)
     .settings(
-      version := "1.5.16-SNAPSHOT",
+      version := "1.5.17-SNAPSHOT",
+      crossScalaVersions := scalaVersionsAll,
       libraryDependencies ++= Seq(
         "com.typesafe.slick" %% "slick"      % theSlickVersion(scalaVersion.value),
         "com.beachape"       %% "enumeratum" % Versions.Core.stable,