From 41526bbe97213cd1d2825d920cabfd7ce948a49c Mon Sep 17 00:00:00 2001 From: xavji Date: Thu, 25 Mar 2021 13:48:45 +0000 Subject: [PATCH] DAS-471 add Device application kind (#43) --- project/Dependencies.scala | 10 ++++------ project/plugins.sbt | 17 ++++++----------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 336b27a..496bba9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,13 +12,12 @@ import sbt._ object Dependencies { object Versions { - val crossScala = Seq("2.13.3", "2.12.12") + val crossScala = Seq("2.13.5", "2.12.13") val scalaVersion = crossScala.head val testCommon = "0.2.3" } val resolvers = Seq( - "HAT Library Artifacts Snapshots" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-snapshots.hubofallthings.com", "HAT Library Artifacts Releases" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-releases.hubofallthings.com" ) @@ -33,10 +32,9 @@ object Dependencies { val testCommon = "io.dataswift" %% "test-common" % Versions.testCommon object DataswiftModels { - private val version = - "2.0.4" - val hatPlay = "io.dataswift" %% "hat-play" % version - val dexPlay = "io.dataswift" %% "dex-play" % version + private val version = "2.2.0" + val hatPlay = "io.dataswift" %% "hat-play" % version + val dexPlay = "io.dataswift" %% "dex-play" % version } } diff --git a/project/plugins.sbt b/project/plugins.sbt index 51b5c7f..244b0f4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,7 @@ -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.7") - -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0") - -resolvers += "HAT Library Artifacts Snapshots" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-snapshots.hubofallthings.com" resolvers += "HAT Library Artifacts Releases" at "https://s3-eu-west-1.amazonaws.com/library-artifacts-releases.hubofallthings.com" - -// ScalaFMT, ScalaFIX and Tools Common -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19") -addSbtPlugin("io.dataswift" % "sbt-scalatools-common" % "0.2.3") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.7") +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") +addSbtPlugin("io.dataswift" % "sbt-scalatools-common" % "0.2.3") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")