DAS-521 HAT Play 2.8 upgrade (#45)

.github/workflows/ci.yml

@@ -24,14 +24,5 @@ jobs:
           java-package: jdk
           architecture: x64
 
-      - name: Clean
-        run: sbt clean
-
-      - name: Compile
-        run: sbt +compile
-
-      - name: Test - Compile 
-        run: sbt +test:compile
-
-      - name: Test
-        run: sbt +test
+      - name: Clean and test
+        run: sbt clean test

.github/workflows/deploy.yml

@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: Publish
-        run: sbt clean +publish
+        run: sbt clean publish
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.ARTIFACTS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.ARTIFACTS_SECRET_ACCESS_KEY }}

build.sbt

@@ -1,11 +1,20 @@
 import Dependencies._
 
+inThisBuild(
+  List(
+    semanticdbEnabled := true,
+    semanticdbVersion := scalafixSemanticdb.revision,
+    scalafixScalaBinaryVersion := "2.13",
+    scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
+  )
+)
+
+scalaVersion := "2.13.5"
+
 configs(IntegrationTest)
 
 Defaults.itSettings
 
-ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.4.4"
-
 libraryDependencies ++= Seq(
   Library.Play.ws,
   Library.Play.json,
@@ -22,11 +31,3 @@ publishTo := {
     s"Models$prefix" at s"s3://library-artifacts-$prefix.hubofallthings.com"
   )
 }
-
-inThisBuild(
-  List(
-    semanticdbEnabled := true,
-    semanticdbVersion := scalafixSemanticdb.revision,
-    scalafixScalaBinaryVersion := "2.13"
-  )
-)

project/BuildSettings.scala

@@ -13,15 +13,13 @@ import sbt._
 ////*******************************
 //// Basic settings
 ////*******************************
-object BasicSettings extends AutoPlugin {
+object BuildSettings extends AutoPlugin {
   override def trigger = allRequirements
 
   override def projectSettings: Seq[Def.Setting[_]] =
     Seq(
       organization := "org.hatdex",
       resolvers ++= Dependencies.resolvers,
-      scalaVersion := Dependencies.Versions.scalaVersion,
-      crossScalaVersions := Dependencies.Versions.crossScala,
       name := "DEX Client Scala",
       description := "Dataswift Exchange HTTP API wrapper for Scala",
       licenses += ("Mozilla Public License 2.0", url("https://www.mozilla.org/en-US/MPL/2.0")),

project/Dependencies.scala

@@ -11,10 +11,10 @@ import sbt._
 
 object Dependencies {
 
-  object Versions {
-    val crossScala   = Seq("2.13.5", "2.12.13")
-    val scalaVersion = crossScala.head
-    val testCommon   = "0.2.3"
+  object Version {
+    val TestCommon = "0.2.3"
+    val PlayJson   = "2.9.1"
+    val DsBackend  = "2.2.1"
   }
 
   val resolvers = Seq(
@@ -23,18 +23,16 @@ object Dependencies {
 
   object Library {
     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 ws       = "com.typesafe.play" %% "play-ahc-ws"    % play.core.PlayVersion.current
+      val json     = "com.typesafe.play" %% "play-json"      % Version.PlayJson
+      val jsonJoda = "com.typesafe.play" %% "play-json-joda" % Version.PlayJson
     }
 
-    val testCommon = "io.dataswift" %% "test-common" % Versions.testCommon
+    val testCommon = "io.dataswift" %% "test-common" % Version.TestCommon
 
     object DataswiftModels {
-      private val version = "2.2.0"
-      val hatPlay         = "io.dataswift" %% "hat-play" % version
-      val dexPlay         = "io.dataswift" %% "dex-play" % version
+      val hatPlay = "io.dataswift" %% "hat-play" % Version.DsBackend
+      val dexPlay = "io.dataswift" %% "dex-play" % Version.DsBackend
     }
 
   }