Skip to content

Commit eb6b449

Browse files
committed
Use G1GC to speedup scalajs tests
1 parent be07703 commit eb6b449

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ project/plugins/project/
7777
/project/.sbtboot
7878
/project/.boot/
7979
/project/.ivy/
80-
/.sbtopts
8180

8281
# Molecule
8382
.molecule/

build.sbt

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
146146
)
147147
})
148148
.jvmSettings(libraryDependencies ++= coreDependenciesJVM)
149-
.jsSettings(libraryDependencies +"io.github.cquiroz" %%% "scala-java-time" % "2.1.0")
149+
.jsSettings(libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.1.0")
150150

151151
lazy val coreJVM = core.jvm
152152
lazy val coreJS = core.js
@@ -203,28 +203,30 @@ lazy val client = crossProject(JSPlatform, JVMPlatform)
203203
.settings(publishSettings)
204204
.settings(
205205
libraryDependencies ++= Seq(
206-
"io.circe" %%% "circe-core" % Versions.Circe,
207-
"io.circe" %%% "circe-generic" % Versions.Circe,
208-
"io.circe" %%% "circe-refined" % Versions.Circe,
209-
"com.chuusai" %%% "shapeless" % Versions.Shapeless,
210-
"eu.timepit" %%% "refined" % Versions.Refined,
211-
"org.typelevel" %%% "cats-core" % Versions.Cats,
212-
"com.softwaremill.sttp.client3" %%% "core" % Versions.Sttp,
213-
"com.softwaremill.sttp.client3" %%% "circe" % Versions.Sttp,
214-
"com.softwaremill.sttp.client3" %%% "json-common" % Versions.Sttp,
215-
"com.softwaremill.sttp.model" %%% "core" % Versions.SttpModel,
216-
"com.softwaremill.sttp.shared" %%% "core" % Versions.SttpShared,
217-
"org.scalatest" %%% "scalatest" % Versions.Scalatest % Test,
206+
"io.circe" %%% "circe-core" % Versions.Circe,
207+
"io.circe" %%% "circe-generic" % Versions.Circe,
208+
"io.circe" %%% "circe-refined" % Versions.Circe,
209+
"com.chuusai" %%% "shapeless" % Versions.Shapeless,
210+
"eu.timepit" %%% "refined" % Versions.Refined,
211+
"org.typelevel" %%% "cats-core" % Versions.Cats,
212+
"com.softwaremill.sttp.client3" %%% "core" % Versions.Sttp,
213+
"com.softwaremill.sttp.client3" %%% "circe" % Versions.Sttp,
214+
"com.softwaremill.sttp.client3" %%% "json-common" % Versions.Sttp,
215+
"com.softwaremill.sttp.model" %%% "core" % Versions.SttpModel,
216+
"com.softwaremill.sttp.shared" %%% "core" % Versions.SttpShared,
217+
"org.scalatest" %%% "scalatest" % Versions.Scalatest % Test
218218
)
219219
)
220220
.jsSettings(libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.1.0")
221221
.jvmSettings(libraryDependencies ++= coreDependenciesJVM)
222-
.jvmSettings(libraryDependencies ++= Seq(
223-
"io.chrisdavenport" %%% "log4cats-core" % Versions.Log4Cats,
224-
"io.chrisdavenport" %%% "log4cats-slf4j" % Versions.Log4Cats % Test,
225-
"com.softwaremill.sttp.client3" %% "http4s-backend" % Versions.Sttp % Test,
226-
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % Versions.Sttp % Test
227-
))
222+
.jvmSettings(
223+
libraryDependencies ++= Seq(
224+
"io.chrisdavenport" %%% "log4cats-core" % Versions.Log4Cats,
225+
"io.chrisdavenport" %%% "log4cats-slf4j" % Versions.Log4Cats % Test,
226+
"com.softwaremill.sttp.client3" %% "http4s-backend" % Versions.Sttp % Test,
227+
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % Versions.Sttp % Test
228+
)
229+
)
228230

229231
lazy val clientJVM = client.jvm
230232
lazy val clientJS = client.js

modules/client/js/src/test/scala/com/azavea/stac4s/api/client/StacClientSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import sttp.monad.EitherMonad
1212

1313
class StacClientSpec extends AnyFunSpec with Matchers {
1414

15-
lazy val backend =
15+
lazy val backend: SttpBackendStub[Either[Throwable, *], Nothing] =
1616
SttpBackendStub(EitherMonad)
1717
.whenRequestMatches(_.uri.path == Seq("collections"))
1818
.thenRespondF { _ =>

scripts/test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
2626
coreJVM/undeclaredCompileDependenciesTest; \
2727
testingJVM/undeclaredCompileDependenciesTest; \
2828
coreTestJVM/undeclaredCompileDependenciesTest; \
29+
clientJVM/undeclaredCompileDependenciesTest; \
2930
coreJVM/unusedCompileDependenciesTest; \
3031
testingJVM/unusedCompileDependenciesTest; \
3132
coreTestJVM/unusedCompileDependenciesTest; \
33+
clientJVM/unusedCompileDependenciesTest; \
3234
test
3335
"
3436
fi

0 commit comments

Comments
 (0)