diff --git a/build.sbt b/build.sbt index a8504ec9f..407c3d301 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ sourcesInBase := false organization := Organization name := Name version := GitBucketVersion -scalaVersion := "2.13.12" +scalaVersion := "2.13.13" crossScalaVersions += "3.4.0" diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index 3e8df696e..386b78d2b 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -42,6 +42,7 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.eclipse.jgit.diff.DiffEntry.ChangeType import org.eclipse.jgit.internal.storage.file.FileRepository import org.json4s.Formats +import org.json4s.convertToJsonInput import org.json4s.jackson.Serialization._ /** diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala index ef3112eae..a8f2c53e2 100644 --- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala +++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala @@ -2,6 +2,7 @@ package gitbucket.core.api import org.json4s.Formats import org.json4s.jackson.JsonMethods +import org.json4s.jvalue2extractable import org.scalatest.funsuite.AnyFunSuite class JsonFormatSpec extends AnyFunSuite { diff --git a/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala index 10cd09d79..220e7f5aa 100644 --- a/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala @@ -24,6 +24,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._ import org.eclipse.jetty.webapp.WebAppContext import org.eclipse.jetty.server.{Request, Server} import org.json4s.jackson.JsonMethods._ +import org.json4s.jvalue2monadic import MergeServiceSpec._ import org.json4s.JsonAST.{JArray, JString}