Use 3.5.0-M4 also when on Scala 2.13

playframework · Jul 15, 2023 · edbdfe4 · edbdfe4
1 parent 626f3fd
commit edbdfe4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/build.sbt b/build.sbt
@@ -47,7 +47,7 @@ lazy val `play-slick-root` = (project in file("."))
 lazy val `play-slick` = (project in file("src/core"))
   .enablePlugins(PlayLibrary, Playdoc, MimaPlugin)
   .configs(Docs)
-  .settings(libraryDependencies ++= Dependencies.core.value)
+  .settings(libraryDependencies ++= Dependencies.core)
   .settings(mimaSettings)
   .settings(commonSettings)
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,17 +1,14 @@
 import sbt._
-import Keys._
 
 object Dependencies {
-  val core = Def.setting(
-    Seq(
-      Library.slick.value,
-      Library.slickHikariCP.value,
-      Library.playCore,
-      Library.playJdbcApi,
-      Library.playLogback % "test",
-      Library.playSpecs2  % "test",
-      Library.h2          % "test"
-    )
+  val core = Seq(
+    Library.slick,
+    Library.slickHikariCP,
+    Library.playCore,
+    Library.playJdbcApi,
+    Library.playLogback % "test",
+    Library.playSpecs2  % "test",
+    Library.h2          % "test"
   )
 
   val evolutions = Seq(
@@ -24,23 +21,17 @@ object Dependencies {
 object Version {
   val play = _root_.play.core.PlayVersion.current
 
-  val slick = Def.setting(
-    if (scalaBinaryVersion.value == "3") {
-      "3.5.0-M4"
-    } else {
-      "3.4.1"
-    }
-  )
-  val h2 = "2.2.220"
+  val slick = "3.5.0-M4"
+  val h2    = "2.2.220"
 }
 
 object Library {
-  val playLogback        = "com.typesafe.play" %% "play-logback"         % Version.play
-  val playCore           = "com.typesafe.play" %% "play"                 % Version.play
-  val playJdbcApi        = "com.typesafe.play" %% "play-jdbc-api"        % Version.play
-  val playJdbcEvolutions = "com.typesafe.play" %% "play-jdbc-evolutions" % Version.play
-  val playSpecs2         = "com.typesafe.play" %% "play-specs2"          % Version.play
-  val slick              = Def.setting("com.typesafe.slick" %% "slick" % Version.slick.value)
-  val slickHikariCP      = Def.setting("com.typesafe.slick" %% "slick-hikaricp" % Version.slick.value)
-  val h2                 = "com.h2database"     % "h2"                   % Version.h2
+  val playLogback        = "com.typesafe.play"  %% "play-logback"         % Version.play
+  val playCore           = "com.typesafe.play"  %% "play"                 % Version.play
+  val playJdbcApi        = "com.typesafe.play"  %% "play-jdbc-api"        % Version.play
+  val playJdbcEvolutions = "com.typesafe.play"  %% "play-jdbc-evolutions" % Version.play
+  val playSpecs2         = "com.typesafe.play"  %% "play-specs2"          % Version.play
+  val slick              = "com.typesafe.slick" %% "slick"                % Version.slick
+  val slickHikariCP      = "com.typesafe.slick" %% "slick-hikaricp"       % Version.slick
+  val h2                 = "com.h2database"      % "h2"                   % Version.h2
 }