Merge pull request #36 from onukura/gb435

Bump to gitbucket 4.35.x

Author: marevol

README.md

@@ -35,6 +35,8 @@ See [Maven Repository](http://central.maven.org/maven2/org/codelibs/gitbucket/gi
 
 | Plugin version | GitBucket version | Fess version  |
 |:--------------:|:-----------------:|:-------------:|
+| 1.7.x          | 4.35 -            | 11.0.1 -, 12.x|
+| 1.6.x          | 4.34              | 11.0.1 -, 12.x|
 | 1.5.x          | 4.32 -            | 11.0.1 -, 12.x|
 | 1.4.x          | 4.24.1 -          | 11.0.1 -, 12.x|
 | 1.3.x          | 4.20 -            | 11.0.1 -, 12.x|

build.sbt

@@ -2,11 +2,11 @@ name := "gitbucket-fess-plugin"
 
 organization := "org.codelibs.gitbucket"
 
-version := "1.6.0"
+version := "1.7.0"
 
-scalaVersion := "2.13.1"
+scalaVersion := "2.13.3"
 
-gitbucketVersion := "4.34.0"
+gitbucketVersion := "4.35.0"
 
 publishMavenStyle := true
 

src/main/scala/Plugin.scala

@@ -21,6 +21,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
          new Version("1.4.1"),
          new Version("1.5.0"),
          new Version("1.6.0"),
+         new Version("1.7.0"),
     )
   override val controllers = Seq(
     // Note: "/api/v3/" is a special prefix in ControllerBase.scala and Implicits.scala

src/main/scala/org/codelibs/gitbucket/fess/controller/FessApiController.scala

@@ -61,12 +61,12 @@ trait FessApiControllerBase extends ControllerBase {
           {
             // Note: 'r.issueCount' and 'r.pullCount' are always 0 (See the implementation of 'getVisibleRepositories')
             // Thus we should compute them here.
-            val countFn = (state: String, isPull: Boolean) =>
+            val countFn = (state: String, isPull: IssueSearchOption) =>
               countIssue(IssueSearchCondition(state = state),
                          isPull,
                          (r.owner, r.name))
-            val issueCount = countFn("open", false) + countFn("closed", false)
-            val pullCount  = countFn("open", true) + countFn("closed", true)
+            val issueCount = countFn("open", IssueSearchOption.Issues) + countFn("closed", IssueSearchOption.Issues)
+            val pullCount  = countFn("open", IssueSearchOption.PullRequests) + countFn("closed", IssueSearchOption.PullRequests)
             val branch     = getDefaultBranch(r).getOrElse("")
 
             FessRepositoryInfo(r.name,