Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-02 21:59:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

update scala 3 build settings

Browse Source
This commit is contained in:
xuwei-k
2023-04-30 13:10:32 +09:00
parent 2bfdca6992
commit d576bbfaed
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -29,7 +29,7 @@ jobs:
- name: Run tests
run: sbt scalafmtSbtCheck scalafmtCheckAll test
- name: Scala 3
run: sbt '++ 3.2.2!' update # TODO
run: sbt '++ 3.x' test
- name: Build executable
run: sbt executable
- name: Upload artifacts

21
build.sbt
View File

@@ -17,6 +17,17 @@ name := Name
version := GitBucketVersion
scalaVersion := "2.13.10"
crossScalaVersions += "3.2.2"
conflictWarning := {
if (scalaBinaryVersion.value == "3") {
// TODO remove this workaround
ConflictWarning("warn", Level.Warn, false)
} else {
conflictWarning.value
}
}
// scalafmtOnCompile := true
coverageExcludedPackages := ".*\\.html\\..*"
@@ -30,10 +41,10 @@ resolvers ++= Seq(
libraryDependencies ++= Seq(
"org.eclipse.jgit" % "org.eclipse.jgit.http.server" % JgitVersion,
"org.eclipse.jgit" % "org.eclipse.jgit.archive" % JgitVersion,
"org.scalatra" %% "scalatra" % ScalatraVersion cross CrossVersion.for3Use2_13,
"org.scalatra" %% "scalatra-json" % ScalatraVersion cross CrossVersion.for3Use2_13,
"org.scalatra" %% "scalatra-forms" % ScalatraVersion cross CrossVersion.for3Use2_13,
"org.json4s" %% "json4s-jackson" % "4.0.6" cross CrossVersion.for3Use2_13,
"org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-json" % ScalatraVersion,
"org.scalatra" %% "scalatra-forms" % ScalatraVersion,
"org.json4s" %% "json4s-jackson" % "4.0.6",
"commons-io" % "commons-io" % "2.11.0",
"io.github.gitbucket" % "solidbase" % "1.0.5",
"io.github.gitbucket" % "markedj" % "1.0.17",
@@ -60,7 +71,7 @@ libraryDependencies ++= Seq(
"org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
"junit" % "junit" % "4.13.2" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"org.mockito" % "mockito-core" % "4.11.0" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.40.15" % "test",
"org.testcontainers" % "mysql" % "1.18.0" % "test",