From 54b80e6edc52d99fc938b69254ea95173637799d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:00:57 +0100 Subject: [PATCH] Some libraries upgrades (#884) * Some libraries upgrades * Configure memory opts --- .jvmopts | 16 ++++++---------- build.sbt | 12 +++++++----- project/ProjectPlugin.scala | 8 ++++---- project/build.properties | 2 +- project/plugins.sbt | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.jvmopts b/.jvmopts index e064f852..b879f0a1 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,11 +1,7 @@ -# Cats jvmopts see https://weblogs.java.net/blog/kcpeppe/archive/2013/12/11/case-study-jvm-hotspot-flags --Xms2G --Xmx6G --Xss64m --XX:MaxMetaspaceSize=1024M --XX:ReservedCodeCacheSize=250M +-Dfile.encoding=UTF8 +-Xms1G +-Xmx5G +-Xss128m +-XX:ReservedCodeCacheSize=500M -XX:+TieredCompilation --XX:-UseGCOverheadLimit -# effectively adds GC to Perm space --XX:+CMSClassUnloadingEnabled -# must be enabled for CMSClassUnloadingEnabled to work +-XX:+UseParallelGC diff --git a/build.sbt b/build.sbt index b9222e61..ea02de3f 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / organization := "com.47deg" val scala212 = "2.12.18" val scala213 = "2.13.12" -val scala3Version = "3.2.2" +val scala3Version = "3.3.0" val scala2Versions = Seq(scala212, scala213) val allScalaVersions = scala2Versions :+ scala3Version ThisBuild / scalaVersion := scala213 @@ -20,13 +20,15 @@ lazy val github4s = (crossProject(JSPlatform, JVMPlatform)) .crossType(CrossType.Full) .withoutSuffixFor(JVMPlatform) .settings(coreDeps: _*) + .jsSettings( + // See the README for why this is necessary + // https://github.com/scala-js/scala-js-macrotask-executor/tree/v1.1.1 + // tl;dr: without it, performance problems and concurrency bugs abound + libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.1.1" % Test + ) .settings( // Increase number of inlines, needed for circe semiauto derivation scalacOptions ++= on(3)(Seq("-Xmax-inlines", "48")).value.flatten, - // See the README for why this is necessary - // https://github.com/scala-js/scala-js-macrotask-executor/tree/v1.0.0 - // tl;dr: without it, performance problems and concurrency bugs abound - libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0" % Test, // Disable nonunit warning on tests Test / scalacOptions -= "-Wnonunit-statement" ) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 239625bd..c8c80eaa 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -15,11 +15,11 @@ object ProjectPlugin extends AutoPlugin { lazy val V = new { val bm4 = "0.3.1" - val cats: String = "2.9.0" - val circe: String = "0.14.3" + val cats: String = "2.10.0" + val circe: String = "0.14.6" val expecty = "0.16.0" - val http4s: String = "0.23.17" - val http4sBlazeClient: String = "0.23.13" + val http4s: String = "0.23.23" + val http4sBlazeClient: String = "0.23.15" val paradise: String = "2.1.1" val scalacheck = "1.17.0" val scalacheckShapeless = "1.3.0" diff --git a/project/build.properties b/project/build.properties index ef3d2662..b19d4e1e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.8.3 +sbt.version = 1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index a708bb1b..77c9b049 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,4 +15,4 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.6" addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")