Skip to content

Commit 239df0e

Browse files
committed
scala: 3.7.4 -> 3.8.1
1 parent 1720800 commit 239df0e

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

build.sbt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ThisBuild / scalacOptions ++= {
2121
}
2222

2323
ThisBuild / scalaVersion := "2.12.21"
24-
ThisBuild / crossScalaVersions := Seq("2.12.21", "3.7.4")
24+
ThisBuild / crossScalaVersions := Seq("2.12.21", "3.8.1")
2525

2626
// Scalafix
2727
ThisBuild / semanticdbEnabled := true
@@ -65,9 +65,9 @@ lazy val warRunner_3_0 =
6565
Compile / compile / javacOptions ++=
6666
Seq(
6767
"-source",
68-
"11",
68+
"17",
6969
"-target",
70-
"11",
70+
"17",
7171
"-g:lines"
7272
),
7373
crossPaths := false, // exclude Scala suffix from artifact names
@@ -84,9 +84,9 @@ lazy val warRunner_3_1 =
8484
Compile / compile / javacOptions ++=
8585
Seq(
8686
"-source",
87-
"11",
87+
"17",
8888
"-target",
89-
"11",
89+
"17",
9090
"-g:lines"
9191
),
9292
crossPaths := false, // exclude Scala suffix from artifact names
@@ -103,14 +103,14 @@ lazy val warRunner_4_0 =
103103
Compile / compile / javacOptions ++=
104104
Seq(
105105
"-source",
106-
"11",
106+
"17",
107107
"-target",
108-
"11",
108+
"17",
109109
"-g:lines"
110110
),
111111
crossPaths := false, // exclude Scala suffix from artifact names
112112
autoScalaLibrary := false, // exclude scala-library from dependencies
113-
libraryDependencies += "com.heroku" % "webapp-runner" % "9.0.113.0"
113+
libraryDependencies += "com.heroku" % "webapp-runner" % "9.0.173.0"
114114
)
115115

116116
lazy val warRunner_6_0 =
@@ -122,9 +122,9 @@ lazy val warRunner_6_0 =
122122
Compile / compile / javacOptions ++=
123123
Seq(
124124
"-source",
125-
"11",
125+
"17",
126126
"-target",
127-
"11",
127+
"17",
128128
"-g:lines"
129129
),
130130
crossPaths := false, // exclude Scala suffix from artifact names

devenv.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,19 @@
1111
pkgs.git
1212
];
1313

14-
languages.java.jdk.package = pkgs.jdk11;
14+
languages.java.jdk.package = pkgs.jdk17;
1515
languages.scala.enable = true;
1616
languages.scala.sbt.enable = true;
1717

1818
scripts.sbt-fmt.exec = ''
1919
sbt \
2020
scalafixAll \
21-
javafmtAll \
2221
scalafmtAll \
2322
scalafmtSbt
2423
'';
2524

2625
scripts.sbt-test.exec = ''
2726
sbt \
28-
javafmtCheckAll \
2927
scalafmtCheckAll \
3028
"scalafixAll --check" \
3129
+test \

project/plugins.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
44
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5")
55
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
6-
addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0")
76
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")

src/test/template/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ libraryDependencies += "com.h2database" % "h2" % "2.2.224"
88
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
99
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.8"
1010

11-
scalaVersion := "3.7.4"
11+
scalaVersion := "3.8.1"

0 commit comments

Comments
 (0)