Merge pull request #17 from SIkebe/gitbucket-4.32.0

Bump to GitBucket 4.32, sbt-gitbucket-plugin 1.5.0 and Scala 2.13.0

Author: mrkm4ntr

.travis.yml

@@ -1,8 +1,8 @@
 language: scala
 scala:
-  - 2.12.1
+  - 2.13.0
 jdk:
-  - oraclejdk8
+  - openjdk8
 env:
   - TRAVIS_NODE_VERSION="4"
 install:

README.md

@@ -12,6 +12,7 @@ Download jar file from [the release page](https://github.com/mrkm4ntr/gitbucket-
 
 Plugin version|GitBucket version
 :---|:---
+1.7|4.32.x
 1.6.x|4.26.x
 1.5|4.19.x
 1.4|4.11.x

build.sbt

@@ -7,16 +7,11 @@ lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 organization := Organization
 name := Name
 version := Version
-scalaVersion := "2.12.4"
+scalaVersion := "2.13.0"
+gitbucketVersion := "4.32.0"
 
 resolvers ++= Seq(
   Resolver.jcenterRepo
 )
 
-libraryDependencies ++= Seq(
-  "io.github.gitbucket" %% "gitbucket" % "4.19.0" % "provided",
-  "com.typesafe.play" %% "twirl-compiler" % "1.3.0" % "provided",
-  "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
-)
-
 scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.13
+sbt.version = 1.2.8

project/plugins.sbt

@@ -1,3 +1,4 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.2")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")

src/main/scala/mrkm4ntr/gitbucket/network/controller/NetworkController.scala

@@ -19,7 +19,8 @@ import org.eclipse.jgit.revwalk.RevSort
 
 import org.json4s.jackson.Serialization
 import scala.annotation.tailrec
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
+import scala.util.Using
 
 class NetworkController extends NetworkControllerBase
   with RepositoryService with AccountService with ReferrerAuthenticator with RequestCache
@@ -34,7 +35,7 @@ trait NetworkControllerBase extends ControllerBase {
   get("/:owner/:repository/network/commits") {
     contentType = formats("json")
     referrersOnly { repository =>
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
 
         @tailrec
         def traverse(plotCommitList: List[(PlotCommit[PlotLane], Int)],