From 396fefca5b5e82d821cc6f50d548e8a9798b236c Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Tue, 8 Sep 2026 07:42:57 +0900
Subject: [PATCH] sbt 2

---
 .github/workflows/build-test.yml | 2 +-
 project/Common.scala             | 8 ++++----
 project/build.properties         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 8d8d48d..2f4cebb 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -39,7 +39,7 @@ jobs:
     with:
       java: 21, 17
       scala: 2.12.x, 2.13.x, 3.x
-      cmd: sbt ++$MATRIX_SCALA test
+      cmd: sbt "++$MATRIX_SCALA ; test"
 
   finish:
     name: Finish
diff --git a/project/Common.scala b/project/Common.scala
index 9fc996e..87b4485 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -36,9 +36,9 @@ object Common extends AutoPlugin {
     Seq(
       organization         := "org.playframework",
       organizationName     := "The Play Framework Project",
-      organizationHomepage := Some(url("https://playframework.com/")),
-      homepage             := Some(url(s"https://github.com/playframework/${repoName}")),
-      licenses             := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
+      organizationHomepage := Some(uri("https://playframework.com/")),
+      homepage             := Some(uri(s"https://github.com/playframework/${repoName}")),
+      licenses             := Seq(License("Apache-2.0", uri("https://www.apache.org/licenses/LICENSE-2.0.html"))),
       scalaVersion         := Scala212,
       crossScalaVersions   := ScalaVersions,
       scalacOptions ++= scalacParameters,
@@ -47,7 +47,7 @@ object Common extends AutoPlugin {
         "playframework",
         "The Play Framework Contributors",
         "contact@playframework.com",
-        url("https://github.com/playframework")
+        uri("https://github.com/playframework")
       ),
       description := "Cachecontrol - Minimal HTTP cache management library in Scala"
     )
diff --git a/project/build.properties b/project/build.properties
index 4a8008f..b8bf4e0 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,4 +1,4 @@
 #
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 #
-sbt.version=1.13.0
+sbt.version=2.0.8