Skip to content

Commit

Permalink
Some libraries upgrades (#884)
Browse files Browse the repository at this point in the history
* Some libraries upgrades

* Configure memory opts
  • Loading branch information
fedefernandez authored Nov 1, 2023
1 parent cf6642c commit 54b80e6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
16 changes: 6 additions & 10 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -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
12 changes: 7 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.8.3
sbt.version = 1.9.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

0 comments on commit 54b80e6

Please sign in to comment.