Bump to Scala 2.13.0 (#83)

Author: takezoe

README.md

@@ -56,6 +56,7 @@ In addition, this plug-in is made to just experiment continuous integration on G
 
 Plugin version | GitBucket version
 :--------------|:--------------------
+1.9.x          | 4.32.x -
 1.8.x          | 4.31.x -
 1.7.x          | 4.30.x -
 1.6.x -        | 4.24.0 -
@@ -66,14 +67,17 @@ Plugin version | GitBucket version
 
 ## Installation
 
-Download jar file from [plugin registry](https://plugins.gitbucket-community.org/releases/gitbucket-ci-plugin) and put into `GITBUCKET_HOME/plugins`.
+Download jar file from [the release page](https://github.com/takezoe/gitbucket-ci-plugin/releases) and put into `GITBUCKET_HOME/plugins`.
 
 ## Build
 
-Run `sbt assembly` and copy generated `/target/scala-2.12/gitbucket-ci-plugin-assembply-x.x.x.jar` to `~/.gitbucket/plugins/` (If the directory does not exist, create it by hand before copying the jar), or just run `sbt install`.
+Run `sbt assembly` and copy generated `/target/scala-2.13/gitbucket-ci-plugin-x.x.x.jar` to `~/.gitbucket/plugins/` (If the directory does not exist, create it by hand before copying the jar), or just run `sbt install`.
 
 ## Release Notes
 
+### 1.9.0
+- Update for GitBUcket 4.32.0 and Scala 2.13.0
+
 ### 1.8.1
 - Bug fix
 

build.sbt

@@ -1,13 +1,14 @@
 name := "gitbucket-ci-plugin"
 organization := "io.github.gitbucket"
-version := "1.8.1"
-scalaVersion := "2.12.8"
-gitbucketVersion := "4.31.0"
+version := "1.9.0"
+scalaVersion := "2.13.0"
+gitbucketVersion := "4.32.0"
+scalacOptions += "-deprecation"
 libraryDependencies ++= Seq(
-  "org.fusesource.jansi" %  "jansi"                % "1.16",
-  "org.scalatest"        %% "scalatest"            % "3.0.5" % "test",
-  "com.dimafeng"         %% "testcontainers-scala" % "0.27.0" % "test",
-  "org.testcontainers"   %  "mysql"                % "1.11.3" % "test",
-  "org.testcontainers"   %  "postgresql"           % "1.11.3" % "test"
+  "org.fusesource.jansi" %  "jansi"                % "1.18",
+  "org.scalatest"        %% "scalatest"            % "3.0.8" % "test",
+  "com.dimafeng"         %% "testcontainers-scala" % "0.29.0" % "test",
+  "org.testcontainers"   %  "mysql"                % "1.12.0" % "test",
+  "org.testcontainers"   %  "postgresql"           % "1.12.0" % "test"
 )
 

project/build.properties

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

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")

src/main/scala/Plugin.scala

@@ -64,7 +64,8 @@ class Plugin extends gitbucket.core.plugin.Plugin with CIService with AccountSer
     new Version("1.7.0"),
     new Version("1.8.0",
       new LiquibaseMigration("update/gitbucket-ci_1.8.0.xml")),
-    new Version("1.8.1")
+    new Version("1.8.1"),
+    new Version("1.9.0")
   )
 
   override val assetsMappings = Seq("/ci" -> "/gitbucket/ci/assets")

src/main/scala/io/github/gitbucket/ci/controller/CIApiController.scala

@@ -4,12 +4,12 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 import io.github.gitbucket.ci.api.{CIApiBuild, CIApiPreviousBuild, CIApiSingleBuild, JsonFormat}
 import io.github.gitbucket.ci.service.CIService
 import org.eclipse.jgit.api.Git
 import org.scalatra.{BadRequest, Ok}
+import scala.util.Using
 
 class CIApiController extends ControllerBase
   with UsersAuthenticator
@@ -84,7 +84,7 @@ class CIApiController extends ControllerBase
 
   post("/api/circleci/v1.1/project/gitbucket/:owner/:repository")(writableUsersOnly { repository =>
     loadCIConfig(repository.owner, repository.name).map { config =>
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         JGitUtil.getDefaultBranch(git, repository).map { case (objectId, revision) =>
           val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
           runBuild(
@@ -110,7 +110,7 @@ class CIApiController extends ControllerBase
   post("/api/circleci/v1.1/project/gitbucket/:owner/:repository/tree/:branch")(writableUsersOnly { repository =>
     val branch = params("branch")
     loadCIConfig(repository.owner, repository.name).map { config =>
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         val objectId = git.getRepository.resolve(branch)
         val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
         runBuild(

src/main/scala/io/github/gitbucket/ci/controller/CIController.scala

@@ -6,7 +6,6 @@ import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.SyntaxSugars.using
 import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.view.helpers.datetimeAgo
@@ -20,6 +19,8 @@ import org.eclipse.jgit.api.Git
 import org.json4s.jackson.Serialization
 import org.scalatra.{BadRequest, Ok}
 
+import scala.util.Using
+
 object CIController {
 
   case class ApiJobOutput(
@@ -135,7 +136,7 @@ class CIController extends ControllerBase
             committer   = result.commitUserName,
             author      = result.buildAuthor,
             startTime   = datetimeAgo(result.startTime),
-            duration    = ((result.endTime.getTime - result.startTime.getTime) / 1000) + " sec"
+            duration    = s"${((result.endTime.getTime - result.startTime.getTime) / 1000)} sec"
           )
         }
     }.map { status =>
@@ -164,7 +165,7 @@ class CIController extends ControllerBase
 
   ajaxPost("/:owner/:repository/build/run")(writableUsersOnly { repository =>
     loadCIConfig(repository.owner, repository.name).map { config =>
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
         JGitUtil.getDefaultBranch(git, repository).map { case (objectId, revision) =>
           val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
           runBuild(
@@ -237,7 +238,7 @@ class CIController extends ControllerBase
     if(file.isFile){
       contentType = FileUtil.getMimeType(path)
       response.setContentLength(file.length.toInt)
-      using(new FileInputStream(file)){ in =>
+      Using.resource(new FileInputStream(file)){ in =>
         IOUtils.copy(in, response.getOutputStream)
       }
     } else {
@@ -309,7 +310,7 @@ class CIController extends ControllerBase
         committer   = result.commitUserName,
         author      = result.buildUserName,
         startTime   = datetimeAgo(result.startTime),
-        duration    = ((result.endTime.getTime - result.startTime.getTime) / 1000) + " sec"
+        duration    = s"${((result.endTime.getTime - result.startTime.getTime) / 1000)} sec"
       )
     }
 
@@ -344,7 +345,7 @@ class CIController extends ControllerBase
     } else {
       saveCIConfig(repository.owner, repository.name, None)
     }
-    flash += "info" -> "Build configuration has been updated."
+    flash.update("info", "Build configuration has been updated.")
     redirect(s"/${repository.owner}/${repository.name}/settings/build")
   })
 

src/main/scala/io/github/gitbucket/ci/hook/CICommitHook.scala

@@ -5,12 +5,12 @@ import gitbucket.core.model.Profile._
 import gitbucket.core.service._
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.JGitUtil
-import gitbucket.core.util.SyntaxSugars.using
 import io.github.gitbucket.ci.model.CIConfig
 import io.github.gitbucket.ci.service.CIService
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
 import profile.blockingApi._
+import scala.util.Using
 
 class CICommitHook extends ReceiveHook
   with CIService with RepositoryService with AccountService with CommitStatusService with SystemSettingsService {
@@ -20,7 +20,7 @@ class CICommitHook extends ReceiveHook
     val branch = command.getRefName.stripPrefix("refs/heads/")
     if(branch != command.getRefName && command.getType != ReceiveCommand.Type.DELETE){
       getRepository(owner, repository).foreach { repositoryInfo =>
-        using(Git.open(getRepositoryDir(owner, repository))) { git =>
+        Using.resource(Git.open(getRepositoryDir(owner, repository))) { git =>
           val sha = command.getNewId.name
           val revCommit = JGitUtil.getRevCommitFromId(git, command.getNewId)
 

src/main/scala/io/github/gitbucket/ci/hook/CIPullRequestHook.scala

@@ -8,10 +8,10 @@ import gitbucket.core.model.Profile._
 import gitbucket.core.service._
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.JGitUtil
-import gitbucket.core.util.SyntaxSugars.using
 import io.github.gitbucket.ci.service.CIService
 import org.eclipse.jgit.api.Git
 import profile.api._
+import scala.util.Using
 
 class CIPullRequestHook extends PullRequestHook
   with PullRequestService with IssuesService with CommitsService with AccountService with WebHookService
@@ -25,7 +25,7 @@ class CIPullRequestHook extends PullRequestHook
         buildAuthor  <- context.loginAccount
         buildConfig  <- loadCIConfig(pullreq.userName, pullreq.repositoryName)
       } yield {
-        val revCommit = using(Git.open(getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))) { git =>
+        val revCommit = Using.resource(Git.open(getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))) { git =>
           val objectId = git.getRepository.resolve(pullreq.commitIdTo)
           JGitUtil.getRevCommitFromId(git, objectId)
         }
@@ -56,7 +56,7 @@ class CIPullRequestHook extends PullRequestHook
         buildConfig  <- loadCIConfig(pullreq.userName, pullreq.repositoryName)
       } yield {
         if(!buildConfig.runWordsSeq.find(content.contains).isEmpty){
-          val revCommit = using(Git.open(getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))) { git =>
+          val revCommit = Using.resource(Git.open(getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))) { git =>
             val objectId = git.getRepository.resolve(pullreq.commitIdTo)
             JGitUtil.getRevCommitFromId(git, objectId)
           }

src/main/scala/io/github/gitbucket/ci/manager/BuildJobThread.scala

@@ -11,7 +11,6 @@ import gitbucket.core.service.{AccountService, CommitStatusService, RepositorySe
 import gitbucket.core.servlet.Database
 import gitbucket.core.util.Directory.getRepositoryDir
 import gitbucket.core.util.Mailer
-import gitbucket.core.util.SyntaxSugars.using
 import io.github.gitbucket.ci.model.CIResult
 import io.github.gitbucket.ci.service._
 import io.github.gitbucket.ci.util.{CIUtils, JobStatus}
@@ -23,6 +22,7 @@ import org.slf4j.LoggerFactory
 
 import scala.sys.process.{Process, ProcessLogger}
 import scala.util.control.ControlThrowable
+import scala.util.Using
 
 
 class BuildJobThread(queue: LinkedBlockingQueue[BuildJob], threads: LinkedBlockingQueue[BuildJobThread]) extends Thread
@@ -97,7 +97,7 @@ class BuildJobThread(queue: LinkedBlockingQueue[BuildJob], threads: LinkedBlocki
         sb.append(s"git clone ${job.buildUserName}/${job.buildRepositoryName}\n")
 
         // git clone
-        using(Git.cloneRepository()
+        Using.resource(Git.cloneRepository()
           .setURI(getRepositoryDir(job.buildUserName, job.buildRepositoryName).toURI.toString)
           .setDirectory(dir).call()) { git =>
 

src/main/scala/io/github/gitbucket/ci/model/CIConfig.scala

@@ -1,5 +1,7 @@
 package io.github.gitbucket.ci.model
 
+import scala.language.postfixOps
+
 trait CIConfigComponent { self: gitbucket.core.model.Profile =>
   import profile.api._
   import self._

src/main/scala/io/github/gitbucket/ci/model/CIResult.scala

@@ -1,6 +1,7 @@
 package io.github.gitbucket.ci.model
 
 import io.github.gitbucket.ci.util.JobStatus
+import scala.language.postfixOps
 
 trait CIResultComponent { self: gitbucket.core.model.Profile =>
   import profile.api._

src/main/scala/io/github/gitbucket/ci/service/CIService.scala

@@ -8,7 +8,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.service.{AccountService, RepositoryService}
 import io.github.gitbucket.ci.util.CIUtils
 import org.apache.commons.io.FileUtils
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 case class BuildJob(
   userName: String,
@@ -145,7 +145,6 @@ trait CIService { self: AccountService with RepositoryService =>
   }
 
   def getQueuedJobs(userName: String, repositoryName: String): Seq[BuildJob] = {
-    import scala.collection.JavaConverters._
     BuildManager.queue.iterator.asScala.filter { job =>
       job.userName == userName && job.repositoryName == repositoryName
     }.toSeq

src/main/scala/io/github/gitbucket/ci/util/CIUtils.scala

@@ -3,9 +3,10 @@ package io.github.gitbucket.ci.util
 import java.io.{ByteArrayOutputStream, File}
 
 import gitbucket.core.util.Directory
-import gitbucket.core.util.SyntaxSugars.using
 import org.fusesource.jansi.HtmlAnsiOutputStream
 
+import scala.util.Using
+
 object CIUtils {
 
   val ContextName = "gitbucket-ci"
@@ -16,8 +17,8 @@ object CIUtils {
   }
 
   def colorize(text: String) = {
-    using(new ByteArrayOutputStream()){ os =>
-      using(new HtmlAnsiOutputStream(os)){ hos =>
+    Using.resource(new ByteArrayOutputStream()){ os =>
+      Using.resource(new HtmlAnsiOutputStream(os)){ hos =>
         hos.write(text.getBytes("UTF-8"))
       }
       new String(os.toByteArray, "UTF-8")

src/test/scala/io/github/gitbucket/ci/MigrationSpec.scala

@@ -8,7 +8,7 @@ import io.github.gitbucket.solidbase.model.Module
 import liquibase.database.core.{H2Database, MySQLDatabase, PostgresDatabase}
 import org.junit.runner.Description
 import org.scalatest.{FunSuite, Tag}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object ExternalDBTest extends Tag("ExternalDBTest")
 
@@ -36,7 +36,7 @@ class MigrationSpec extends FunSuite {
         // TODO https://github.com/testcontainers/testcontainers-java/issues/736
         container.withCommand("mysqld --default-authentication-plugin=mysql_native_password")
       }
-      container.starting()
+      container.start()
       try {
         new Solidbase().migrate(
           DriverManager.getConnection(s"${container.jdbcUrl}?useSSL=false", container.username, container.password),
@@ -45,7 +45,7 @@ class MigrationSpec extends FunSuite {
           new Module(plugin.pluginId, plugin.versions.asJava)
         )
       } finally {
-        container.finished()
+        container.stop()
       }
     }
   }
@@ -54,7 +54,7 @@ class MigrationSpec extends FunSuite {
     test(s"Migration PostgreSQL $tag", ExternalDBTest) {
       val container = PostgreSQLContainer(s"postgres:$tag")
 
-      container.starting()
+      container.start()
       try {
         new Solidbase().migrate(
           DriverManager.getConnection(container.jdbcUrl, container.username, container.password),
@@ -63,7 +63,7 @@ class MigrationSpec extends FunSuite {
           new Module(plugin.pluginId, plugin.versions.asJava)
         )
       } finally {
-        container.finished()
+        container.stop()
       }
     }
   }