(refs #1346)Update to use blocking-slick for Scala 2.12 support
1 parent 5698692 commit 1d03e83d9531f1126c47e91a11fa61bc0e8d65ca
@Naoki Takezoe Naoki Takezoe authored on 14 Dec 2016
Showing 16 changed files
View
5
build.sbt
"org.apache.sshd" % "apache-sshd" % "1.2.0",
"org.apache.tika" % "tika-core" % "1.13",
//"com.typesafe.slick" %% "slick" % "3.2.0-M1",
"com.github.takezoe" %% "blocking-slick" % "0.0.3-SNAPSHOT",
"joda-time" % "joda-time" % "2.9.6",
"com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.4.192",
"mysql" % "mysql-connector-java" % "5.1.39",
"org.postgresql" % "postgresql" % "9.4.1208",
"com.zaxxer" % "HikariCP" % "2.4.6",
"com.typesafe" % "config" % "1.3.0",
"com.typesafe.akka" %% "akka-actor" % "2.4.12",
"fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0",
"com.enragedginger" % "akka-quartz-scheduler_2.11" % "1.5.0-akka-2.4.x" exclude("c3p0","c3p0"), // TODO Scala 2.12
"com.enragedginger" %% "akka-quartz-scheduler" % "1.6.0-akka-2.4.x" exclude("c3p0","c3p0"),
"org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
"junit" % "junit" % "4.12" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test"
)
 
// Compiler settings
scalacOptions := Seq("-deprecation", "-language:postfixOps", "-Ybackend:GenBCode", "-Ydelambdafy:method", "-target:jvm-1.8")
scalacOptions := Seq("-deprecation", "-language:postfixOps", "-Ydelambdafy:method", "-target:jvm-1.8")
javacOptions in compile ++= Seq("-target", "8", "-source", "8")
javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
 
// Test settings
View
2
■■■
project/plugins.sbt
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.1")
addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
View
src/main/scala/gitbucket/core/service/AccessTokenService.scala
View
src/main/scala/gitbucket/core/service/AccountService.scala
View
src/main/scala/gitbucket/core/service/ActivityService.scala
View
src/main/scala/gitbucket/core/service/CommitStatusService.scala
View
src/main/scala/gitbucket/core/service/CommitsService.scala
View
src/main/scala/gitbucket/core/service/IssuesService.scala
View
src/main/scala/gitbucket/core/service/LabelsService.scala
View
src/main/scala/gitbucket/core/service/MilestonesService.scala
View
src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
View
src/main/scala/gitbucket/core/service/PullRequestService.scala
View
src/main/scala/gitbucket/core/service/RepositoryService.scala
View
src/main/scala/gitbucket/core/service/SshKeyService.scala
View
src/main/scala/gitbucket/core/service/WebHookService.scala
View
src/main/scala/gitbucket/core/util/StringUtil.scala