Skip to content

Commit c97475e

Browse files
authored
Merge pull request #141 from xuwei-k/patch-1
Update dependencies
2 parents 5544c90 + 5f0a6d5 commit c97475e

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

.github/workflows/scala.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
java: [17, 21]
15-
scala: ['2.12.20', '2.13.15', '3.3.4']
15+
scala: ['2.12.20', '2.13.17', '3.3.7']
1616
steps:
1717
- uses: actions/checkout@v5
1818
- name: Set up JDK

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")
1+
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.18.0")
22

33
scalacOptions += "-deprecation"

src/main/g8/build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ lazy val hello = (project in file("."))
1010
libraryDependencies ++= Seq(
1111
"org.scalatra" %% "scalatra-jakarta" % ScalatraVersion,
1212
"org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % "test",
13-
"ch.qos.logback" % "logback-classic" % "1.5.6" % "runtime",
14-
"jakarta.servlet" % "jakarta.servlet-api" % "6.0.0" % "provided"
13+
"ch.qos.logback" % "logback-classic" % "1.5.19" % "runtime",
1514
),
1615
)
1716

src/main/g8/default.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name=My Scalatra Web App
33
version=0.1.0-SNAPSHOT
44
servlet_name=MyScalatraServlet
55
package=com.example.app
6-
scala_version=3.3.4
7-
sbt_version=1.10.7
8-
scalatra_version=3.1.1
9-
twirl_version=2.0.7
6+
scala_version=3.3.7
7+
sbt_version=1.11.7
8+
scalatra_version=3.1.2
9+
twirl_version=2.0.9
1010
sbt_war=5.0.0-M7
11-
jetty_version=12.0.16
11+
jetty_version=12.0.28

0 commit comments

Comments
 (0)