Skip to content

Commit d500036

Browse files
committed
Cleanup of build
1 parent 2892393 commit d500036

1 file changed

Lines changed: 31 additions & 16 deletions

File tree

build.sbt

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ lazy val commonSettings = Seq(
3131
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
3232
case Some((2, 12)) => Seq(
3333
"-language:higherKinds",
34-
"-opt:l:method")
34+
"-opt:l:method"
35+
)
3536
case Some((2, 13)) => Seq(
3637
"-opt:l:method"
3738
)
@@ -43,6 +44,9 @@ lazy val commonSettings = Seq(
4344
)
4445
}),
4546
compileOrder := CompileOrder.JavaThenScala,
47+
libraryDependencies ++= Seq(
48+
"org.scalatest" %%% "scalatest" % "3.2.20" % Test
49+
),
4650
Test / testOptions += Tests.Argument("-oDF"),
4751
sonatypeProfileName := "com.github.plokhotnyuk",
4852
versionScheme := Some("early-semver"),
@@ -180,8 +184,7 @@ lazy val `jsoniter-scala-core` = crossProject(JVMPlatform, JSPlatform, NativePla
180184
}),
181185
libraryDependencies ++= Seq(
182186
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.14.0" % Test,
183-
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test,
184-
"org.scalatest" %%% "scalatest" % "3.2.20" % Test
187+
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test
185188
)
186189
)
187190

@@ -226,7 +229,6 @@ lazy val `jsoniter-scala-macros` = crossProject(JVMPlatform, JSPlatform, NativeP
226229
}) ++ Seq(
227230
"dev.zio" %%% "zio" % "2.1.26" % Test,
228231
"com.epam.deltix" % "dfp" % "1.0.10" % Test,
229-
"org.scalatest" %%% "scalatest" % "3.2.20" % Test,
230232
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.14.0" % Test
231233
)
232234
)
@@ -253,8 +255,7 @@ lazy val `jsoniter-scala-next-tests` = crossProject(JVMPlatform, JSPlatform, Nat
253255
)
254256
}),
255257
libraryDependencies ++= Seq(
256-
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test,
257-
"org.scalatest" %%% "scalatest" % "3.2.20" % Test
258+
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test
258259
)
259260
)
260261

@@ -282,8 +283,7 @@ lazy val `jsoniter-scala-circe` = crossProject(JVMPlatform, JSPlatform, NativePl
282283
libraryDependencies ++= Seq(
283284
"io.circe" %%% "circe-core" % "0.14.15",
284285
"io.circe" %%% "circe-parser" % "0.14.15" % Test,
285-
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test,
286-
"org.scalatest" %%% "scalatest" % "3.2.20" % Test
286+
"org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test
287287
)
288288
)
289289

@@ -335,8 +335,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
335335
"org.openjdk.jmh" % "jmh-core" % "1.37",
336336
"org.openjdk.jmh" % "jmh-generator-asm" % "1.37",
337337
"org.openjdk.jmh" % "jmh-generator-bytecode" % "1.37",
338-
"org.openjdk.jmh" % "jmh-generator-reflection" % "1.37",
339-
"org.scalatest" %%% "scalatest" % "3.2.20" % Test
338+
"org.openjdk.jmh" % "jmh-generator-reflection" % "1.37"
340339
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
341340
case Some((2, _)) => Seq(
342341
"io.bullet" %%% "borer-derivation" % "1.8.0",
@@ -368,8 +367,16 @@ lazy val assemblyJSBenchmarks = sys.props.get("assemblyJSBenchmarks").isDefined
368367

369368
lazy val `jsoniter-scala-benchmarkJS` = `jsoniter-scala-benchmark`.js
370369
.enablePlugins({
371-
if (assemblyJSBenchmarks) Seq(JSDependenciesPlugin)
372-
else Seq(JSDependenciesPlugin, ScalaJSBundlerPlugin)
370+
if (assemblyJSBenchmarks) {
371+
Seq(
372+
JSDependenciesPlugin
373+
)
374+
} else {
375+
Seq(
376+
JSDependenciesPlugin,
377+
ScalaJSBundlerPlugin
378+
)
379+
}
373380
}*)
374381
.settings(jsSettings)
375382
.settings(
@@ -378,8 +385,16 @@ lazy val `jsoniter-scala-benchmarkJS` = `jsoniter-scala-benchmark`.js
378385
Compile / mainClass := Some("com.github.plokhotnyuk.jsoniter_scala.benchmark.Main")
379386
)
380387
.settings({
381-
if (assemblyJSBenchmarks) Seq(scalaJSLinkerConfig ~= {
382-
_.withModuleKind(ModuleKind.NoModule)
383-
}, Test / test := {})
384-
else Seq(Test / requireJsDomEnv := true)
388+
if (assemblyJSBenchmarks) {
389+
Seq(
390+
scalaJSLinkerConfig ~= {
391+
_.withModuleKind(ModuleKind.NoModule)
392+
},
393+
Test / test := {}
394+
)
395+
} else {
396+
Seq(
397+
Test / requireJsDomEnv := true
398+
)
399+
}
385400
}*)

0 commit comments

Comments
 (0)