@@ -7,14 +7,13 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
77import scalajsbundler .sbtplugin .ScalaJSBundlerPlugin
88import scalajsbundler .sbtplugin .ScalaJSBundlerPlugin .autoImport ._
99
10-
1110object dependencies {
1211
12+ lazy val copyFastOptJS =
13+ TaskKey [Unit ](" copyFastOptJS" , " Copy javascript files to target directory" )
1314
14- lazy val copyFastOptJS = TaskKey [Unit ](" copyFastOptJS" , " Copy javascript files to target directory" )
15-
16- val withTests : String = " compile->compile;test->test"
17- val inTestOnly : String = " test->test"
15+ val withTests : String = " compile->compile;test->test"
16+ val inTestOnly : String = " test->test"
1817
1918 val scala212 = " 2.12.12"
2019 val scala213 = " 2.13.3"
@@ -23,7 +22,7 @@ object dependencies {
2322 lazy val JvmTest = config(" jvm" ).extend(Test )
2423
2524 val addResolvers = Seq (
26- Resolver .sonatypeRepo(" public" )
25+ Resolver .sonatypeRepo(" public" ),
2726 )
2827
2928 object versions {
@@ -49,26 +48,29 @@ object dependencies {
4948 val scalaCheck = " 1.15.2"
5049 val scalajs = " 1.0.0"
5150 val scalaJavaTime = " 2.0.0"
52- val scalaTest = " 3.2.3 "
51+ val scalaTest = " 3.2.16 "
5352 val scalaTestPlusScalacheck = " 3.2.2.0"
5453 val simulacrum = " 1.0.0"
5554 val tsec = " 0.2.1-ct-2"
5655 }
5756
5857 def compilerPlugins = Seq (
59- compilerPlugin(" com.olegpy" %% " better-monadic-for" % versions.betterMonadicFor)
58+ compilerPlugin(" com.olegpy" %% " better-monadic-for" % versions.betterMonadicFor),
6059 )
6160
6261 def compilerPluginsForVersion (version : String ) =
6362 CrossVersion .partialVersion(version) match {
6463 case Some ((2 , major)) if major < 13 =>
6564 compilerPlugins ++ Seq (
66- compilerPlugin(" org.scalamacros" % " paradise" % versions.macroParadise cross CrossVersion .full),
67- compilerPlugin(" org.typelevel" %% " kind-projector" % versions.kindProjector212)
65+ compilerPlugin(
66+ (" org.scalamacros" % " paradise" % versions.macroParadise).cross(CrossVersion .full),
67+ ),
68+ compilerPlugin(" org.typelevel" %% " kind-projector" % versions.kindProjector212),
69+ )
70+ case Some ((2 , major)) if major == 13 =>
71+ compilerPlugins ++ Seq (
72+ compilerPlugin(" org.typelevel" % s " kind-projector_ $version" % versions.kindProjector213),
6873 )
69- case Some ((2 , major)) if major == 13 => compilerPlugins ++ Seq (
70- compilerPlugin(" org.typelevel" % s " kind-projector_ $version" % versions.kindProjector213)
71- )
7274 case _ => compilerPlugins
7375 }
7476
@@ -77,7 +79,7 @@ object dependencies {
7779 " http4s-blaze-server" ,
7880 " http4s-blaze-client" ,
7981 " http4s-circe" ,
80- " http4s-dsl"
82+ " http4s-dsl" ,
8183 ).map(" org.http4s" %% _ % versions.http4s)
8284
8385 val testDeps = Seq (
@@ -92,11 +94,11 @@ object dependencies {
9294
9395 val dbDeps = Seq (
9496 " org.flywaydb" % " flyway-core" % versions.flyway,
95- " org.postgresql" % " postgresql" % versions.postgres
97+ " org.postgresql" % " postgresql" % versions.postgres,
9698 ) ++ Seq (
9799 " doobie-core" ,
98100 " doobie-postgres" ,
99- " doobie-hikari"
101+ " doobie-hikari" ,
100102 ).map(" org.tpolecat" %% _ % versions.doobie)
101103
102104 val commonDeps = Seq (
@@ -105,7 +107,7 @@ object dependencies {
105107 " cats-mtl-core" -> versions.catsMtl,
106108 ).map((" org.typelevel" %% (_ : String ) % (_ : String )).tupled) ++ Seq (
107109 " org.apache.commons" % " commons-lang3" % versions.apacheLang3,
108- " ch.qos.logback" % " logback-classic" % versions.logback,
110+ " ch.qos.logback" % " logback-classic" % versions.logback,
109111 " org.codehaus.janino" % " janino" % versions.janino,
110112 " org.typelevel" %% " simulacrum" % versions.simulacrum,
111113 ) ++ Seq (
@@ -114,7 +116,7 @@ object dependencies {
114116 " circe-parser" ,
115117// "circe-java8"
116118 ).map(" io.circe" %% _ % versions.circe) ++ Seq (
117- " io.circe" %% " circe-config" % versions.circeConfig
119+ " io.circe" %% " circe-config" % versions.circeConfig,
118120 )
119121
120122 val authDeps = Seq (
@@ -126,6 +128,6 @@ object dependencies {
126128 " tsec-hash-jca" ,
127129 " tsec-jwt-mac" ,
128130 " tsec-jwt-sig" ,
129- " tsec-http4s"
131+ " tsec-http4s" ,
130132 ).map(" com.clovellytech" %% _ % versions.tsec)
131133}
0 commit comments