DAS-471 fix dependencies for HAT

dataswift · Mar 26, 2021 · ae6d042 · ae6d042
1 parent 41526bb
commit ae6d042
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ configs(IntegrationTest)
 
 Defaults.itSettings
 
-ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.4.4"
+ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
 
 libraryDependencies ++= Seq(
   Library.Play.ws,
@@ -27,6 +27,6 @@ inThisBuild(
   List(
     semanticdbEnabled := true,
     semanticdbVersion := scalafixSemanticdb.revision,
-    scalafixScalaBinaryVersion := "2.13"
+    scalafixScalaBinaryVersion := "2.12"
   )
 )
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -12,7 +12,7 @@ import sbt._
 object Dependencies {
 
   object Versions {
-    val crossScala   = Seq("2.13.5", "2.12.13")
+    val crossScala   = Seq("2.12.13")
     val scalaVersion = crossScala.head
     val testCommon   = "0.2.3"
   }
@@ -25,14 +25,14 @@ object Dependencies {
     object Play {
       val version  = play.core.PlayVersion.current
       val ws       = "com.typesafe.play" %% "play-ahc-ws"    % version
-      val json     = "com.typesafe.play" %% "play-json"      % "2.9.1"
-      val jsonJoda = "com.typesafe.play" %% "play-json-joda" % "2.9.1"
+      val json     = "com.typesafe.play" %% "play-json"      % "2.6.14"
+      val jsonJoda = "com.typesafe.play" %% "play-json-joda" % "2.6.14"
     }
 
     val testCommon = "io.dataswift" %% "test-common" % Versions.testCommon
 
     object DataswiftModels {
-      private val version = "2.2.0"
+      private val version = "2.2.1_play2625"
       val hatPlay         = "io.dataswift" %% "hat-play" % version
       val dexPlay         = "io.dataswift" %% "dex-play" % version
     }

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += "HAT Library Artifacts Releases" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-releases.hubofallthings.com"
-addSbtPlugin("com.typesafe.play"  % "sbt-plugin"            % "2.8.7")
+addSbtPlugin("com.typesafe.play"  % "sbt-plugin"            % "2.6.25")
 addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver"    % "0.19.0")
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"          % "2.4.2")
 addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"          % "0.9.26")