From eb52dfdefce35aa15523061e499065ee85659857 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 2 Jul 2018 17:03:39 -0700 Subject: Updgrade settings and spray-json-derivation --- build.sbt | 65 +++++++++++++++++++++-------------------------------- project/plugins.sbt | 2 +- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/build.sbt b/build.sbt index b3da6dc..af0121c 100644 --- a/build.sbt +++ b/build.sbt @@ -8,53 +8,40 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) .crossType(CrossType.Full) .in(file(".")) .enablePlugins(Library) - .disablePlugins(Linting) .settings( - scalacOptions in Compile ++= Seq( - "-language:higherKinds", - "-language:implicitConversions", - "-language:postfixOps", - "-language:reflectiveCalls", // TODO this should be discouraged - "-unchecked", - "-deprecation", - "-feature", - "-encoding", - "utf8", - "-Xlint:_,-unused,-missing-interpolator", - "-Ywarn-numeric-widen", - "-Ywarn-dead-code", - "-Ywarn-unused:_,-explicits,-implicits" - ), libraryDependencies ++= Seq( - "xyz.driver" %%% "spray-json-derivation" % "0.4.7", + "xyz.driver" %%% "spray-json-derivation" % "0.5.0", "com.beachape" %%% "enumeratum" % "1.5.13", "org.scalaz" %%% "scalaz-core" % "7.2.24", "eu.timepit" %%% "refined" % "0.9.1", "org.scalatest" %%% "scalatest" % "3.0.5" % "test" ) ) - .jvmSettings(libraryDependencies ++= Seq( - "xyz.driver" %% "tracing" % "0.1.2", - "com.typesafe.akka" %% "akka-actor" % "2.5.13", - "com.typesafe.akka" %% "akka-stream" % "2.5.13", - "com.typesafe.akka" %% "akka-http-core" % akkaHttpV, - "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpV, - "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV, - "com.pauldijou" %% "jwt-core" % "0.16.0", - "org.scalacheck" %% "scalacheck" % "1.14.0" % "test", - "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.14.0", - "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", - "com.typesafe.slick" %% "slick" % "3.2.3", - "org.mockito" % "mockito-core" % "1.9.5" % Test, - "com.amazonaws" % "aws-java-sdk-s3" % "1.11.342", - "com.google.cloud" % "google-cloud-pubsub" % "1.31.0", - "com.google.cloud" % "google-cloud-storage" % "1.31.0", - "com.typesafe" % "config" % "1.3.3", - "ch.qos.logback" % "logback-classic" % "1.2.3", - "ch.qos.logback.contrib" % "logback-json-classic" % "0.1.5", - "ch.qos.logback.contrib" % "logback-jackson" % "0.1.5", - "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.7" - )) + .jvmSettings( + fork in Test := true, + libraryDependencies ++= Seq( + "xyz.driver" %% "tracing" % "0.1.2", + "com.typesafe.akka" %% "akka-actor" % "2.5.13", + "com.typesafe.akka" %% "akka-stream" % "2.5.13", + "com.typesafe.akka" %% "akka-http-core" % akkaHttpV, + "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpV, + "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV, + "com.pauldijou" %% "jwt-core" % "0.16.0", + "org.scalacheck" %% "scalacheck" % "1.14.0" % "test", + "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.14.0", + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0", + "com.typesafe.slick" %% "slick" % "3.2.3", + "org.mockito" % "mockito-core" % "1.9.5" % Test, + "com.amazonaws" % "aws-java-sdk-s3" % "1.11.342", + "com.google.cloud" % "google-cloud-pubsub" % "1.31.0", + "com.google.cloud" % "google-cloud-storage" % "1.31.0", + "com.typesafe" % "config" % "1.3.3", + "ch.qos.logback" % "logback-classic" % "1.2.3", + "ch.qos.logback.contrib" % "logback-json-classic" % "0.1.5", + "ch.qos.logback.contrib" % "logback-jackson" % "0.1.5", + "com.googlecode.libphonenumber" % "libphonenumber" % "8.9.7" + ) + ) lazy val coreJVM = core.jvm lazy val coreJS = core.js diff --git a/project/plugins.sbt b/project/plugins.sbt index ce860c8..cd9e6fc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("xyz.driver" % "sbt-settings" % "2.0.0-RC2") +addSbtPlugin("xyz.driver" % "sbt-settings" % "2.0.0-RC2-SNAPSHOT") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23") -- cgit v1.2.3