Skip to content

Commit fc4ce58

Browse files
committed
Bump scala, sbt and java version
1 parent 57407b8 commit fc4ce58

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.jvmopts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
--add-opens=java.base/java.util=ALL-UNNAMED
1010
--add-opens=java.desktop/java.awt.event=ALL-UNNAMED
1111
--add-opens=java.desktop/java.awt=ALL-UNNAMED
12+
1213
--enable-preview
13-
-Xmx2G
14-
-XX:ReservedCodeCacheSize=1000m
14+
15+
-Xms1G
16+
-Xmx6G
1517
-Xss8M
18+
-XX:ReservedCodeCacheSize=1000m

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Dependencies {
88
if (withTests) dep % "test->compile;test->test" else dep % "test"
99

1010
object versions {
11-
val ScalaV = "2.13.10"
11+
val ScalaV = "2.13.12"
1212
val ScalatraV = "2.8.4"
1313
val HikariConnectionPoolV = "5.0.1"
1414
val ScalaLoggingV = "3.9.5"

project/Module.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ trait Module {
5151
organization := "ndla",
5252
version := "0.0.1",
5353
scalaVersion := ScalaV,
54-
javacOptions ++= Seq("-source", "20", "-target", "20"),
54+
javacOptions ++= Seq("-source", "21", "-target", "21"),
5555
ghGenerateEnable := true,
5656
ghGenerateEnableRelease := this.enableReleases,
5757
javaOptions ++= reflectiveAccessOptions,

project/build.properties

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

0 commit comments

Comments
 (0)