From 5f0a6d5b0acb88d4b6e2075da0d9215fbd28e3bf Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Mon, 13 Oct 2025 18:36:03 +0900 Subject: [PATCH] Update dependency versions in default.properties --- .github/workflows/scala.yml | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- src/main/g8/build.sbt | 3 +-- src/main/g8/default.properties | 10 +++++----- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index abeeb16..3013475 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: java: [17, 21] - scala: ['2.12.20', '2.13.15', '3.3.4'] + scala: ['2.12.20', '2.13.17', '3.3.7'] steps: - uses: actions/checkout@v5 - name: Set up JDK diff --git a/project/build.properties b/project/build.properties index 73df629..01a16ed 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.11.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index be7c81b..4cf7d79 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.18.0") scalacOptions += "-deprecation" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index a6e3a96..05d03e8 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -10,8 +10,7 @@ lazy val hello = (project in file(".")) libraryDependencies ++= Seq( "org.scalatra" %% "scalatra-jakarta" % ScalatraVersion, "org.scalatra" %% "scalatra-scalatest-jakarta" % ScalatraVersion % "test", - "ch.qos.logback" % "logback-classic" % "1.5.6" % "runtime", - "jakarta.servlet" % "jakarta.servlet-api" % "6.0.0" % "provided" + "ch.qos.logback" % "logback-classic" % "1.5.19" % "runtime", ), ) diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 4675cdd..d115fd3 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -3,9 +3,9 @@ name=My Scalatra Web App version=0.1.0-SNAPSHOT servlet_name=MyScalatraServlet package=com.example.app -scala_version=3.3.4 -sbt_version=1.10.7 -scalatra_version=3.1.1 -twirl_version=2.0.7 +scala_version=3.3.7 +sbt_version=1.11.7 +scalatra_version=3.1.2 +twirl_version=2.0.9 sbt_war=5.0.0-M7 -jetty_version=12.0.16 +jetty_version=12.0.28