diff --git a/build.sbt b/build.sbt index ab09c78..41ef043 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" val GitBucketVersion = "4.6.0" -val ScalatraVersion = "2.4.1" +val ScalatraVersion = "2.5.0-RC1" val JettyVersion = "9.3.9.v20160517" lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin) @@ -10,7 +10,7 @@ organization := Organization name := Name version := GitBucketVersion -scalaVersion := "2.11.8" +scalaVersion := "2.12.0" // dependency settings resolvers ++= Seq( @@ -20,38 +20,38 @@ "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/" ) libraryDependencies ++= Seq( - "org.scala-lang.modules" %% "scala-java8-compat" % "0.7.0", - "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.1.2.201602141800-r", - "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.1.2.201602141800-r", - "org.scalatra" %% "scalatra" % ScalatraVersion, - "org.scalatra" %% "scalatra-json" % ScalatraVersion, - "org.json4s" %% "json4s-jackson" % "3.3.0", - "io.github.gitbucket" %% "scalatra-forms" % "1.0.0", - "commons-io" % "commons-io" % "2.4", - "io.github.gitbucket" % "solidbase" % "1.0.0", - "io.github.gitbucket" % "markedj" % "1.0.9", - "org.apache.commons" % "commons-compress" % "1.11", - "org.apache.commons" % "commons-email" % "1.4", - "org.apache.httpcomponents" % "httpclient" % "4.5.1", - "org.apache.sshd" % "apache-sshd" % "1.2.0", - "org.apache.tika" % "tika-core" % "1.13", - "com.typesafe.slick" %% "slick" % "2.1.0", - "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", - "ch.qos.logback" % "logback-classic" % "1.1.7", - "com.zaxxer" % "HikariCP" % "2.4.6", - "com.typesafe" % "config" % "1.3.0", - "com.typesafe.akka" %% "akka-actor" % "2.3.15", - "fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0", - "com.enragedginger" %% "akka-quartz-scheduler" % "1.4.0-akka-2.3.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", - "com.wix" % "wix-embedded-mysql" % "1.0.3" % "test", - "ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test" + "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0", + "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.1.2.201602141800-r", + "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.1.2.201602141800-r", + "org.scalatra" %% "scalatra" % ScalatraVersion, + "org.scalatra" %% "scalatra-json" % ScalatraVersion, + "org.json4s" %% "json4s-jackson" % "3.5.0", + "io.github.gitbucket" %% "scalatra-forms" % "1.1.0-SNAPSHOT", + "commons-io" % "commons-io" % "2.4", + "io.github.gitbucket" % "solidbase" % "1.0.0", + "io.github.gitbucket" % "markedj" % "1.0.9", + "org.apache.commons" % "commons-compress" % "1.11", + "org.apache.commons" % "commons-email" % "1.4", + "org.apache.httpcomponents" % "httpclient" % "4.5.1", + "org.apache.sshd" % "apache-sshd" % "1.2.0", + "org.apache.tika" % "tika-core" % "1.13", + "com.typesafe.slick" %% "slick" % "3.2.0-M1", + "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", + "ch.qos.logback" % "logback-classic" % "1.1.7", + "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 + "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", + "com.wix" % "wix-embedded-mysql" % "1.0.3" % "test", + "ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test" ) // Compiler settings diff --git a/project/build.properties b/project/build.properties index 35c88ba..27e88aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version=0.13.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index 181fe48..21a6329 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0") -addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1") +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")