Skip to content

Commit aa67cbd

Browse files
committed
Merge branch 'master' into update/pureconfig-core-0.17.8
2 parents eb82dea + 7d3bd2f commit aa67cbd

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scoverage.ScoverageKeys.*
99
import scala.sys.process.Process
1010

1111
val v2_12 = "2.12.20"
12-
val v2_13 = "2.13.14"
12+
val v2_13 = "2.13.15"
1313
val v3 = "3.3.4"
1414

1515
lazy val resolvedScalaVersion =
@@ -54,7 +54,7 @@ val pekkoHttpTestkit = "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVer
5454

5555
val scala2Async = "org.scala-lang.modules" %% "scala-async" % "1.0.1"
5656
val scala3Async =
57-
"com.github.rssh" %% "shim-scala-async-dotty-cps-async" % "0.9.21" // allows cross compilation w/o changes in source code
57+
"com.github.rssh" %% "shim-scala-async-dotty-cps-async" % "0.9.23" // allows cross compilation w/o changes in source code
5858

5959
val scalikeJdbc = "org.scalikejdbc" %% "scalikejdbc" % "4.3.2"
6060
val h2 = "com.h2database" % "h2" % "2.2.224"
@@ -325,6 +325,7 @@ lazy val nativeServer: Project = (project in file("native-server"))
325325
"-H:IncludeResources=.*\\.properties",
326326
"-H:+ReportExceptionStackTraces",
327327
"-H:-ThrowUnsafeOffsetErrors",
328+
"$(uname -m | grep -Eiq 'arm|aarch64' && echo \"-H:PageSize=64K\")",
328329
s"-H:Name=$binaryName",
329330
"--enable-http",
330331
"--enable-https",

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.4
1+
sbt.version=1.10.6

ui/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4418,9 +4418,9 @@ electron-to-chromium@^1.3.571:
44184418
integrity sha512-L9BwLwJohjZW9mQESI79HRzhicPk1DFgM+8hOCfGgGCFEcA3Otpv7QK6SGtYoZvfQfE3wKLh0Hd5ptqUFv3gvQ==
44194419

44204420
elliptic@^6.5.3, elliptic@^6.5.4:
4421-
version "6.5.7"
4422-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
4423-
integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
4421+
version "6.6.0"
4422+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210"
4423+
integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==
44244424
dependencies:
44254425
bn.js "^4.11.9"
44264426
brorand "^1.1.0"

0 commit comments

Comments
 (0)