Skip to content

Commit 57e54c6

Browse files
committed
update plugins & gitbucket
1 parent b973ab2 commit 57e54c6

File tree

6 files changed

+15
-23
lines changed

6 files changed

+15
-23
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resolvers ++= Seq(
1111
)
1212

1313
libraryDependencies ++= Seq(
14-
"io.github.gitbucket" %% "gitbucket" % "4.20.0",
14+
"io.github.gitbucket" %% "gitbucket" % "4.21.0",
1515
"javax.servlet" % "javax.servlet-api" % "3.1.0"
1616
)
1717

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
1+
sbt.version=1.1.0

project/plugins.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
2-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
3-
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.1.1")
4-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.3")
5-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
1+
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
2+
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
3+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")
4+
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.13")
5+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.3")

src/main/scala/Plugin.scala

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,20 @@ class Plugin extends gitbucket.core.plugin.Plugin {
2424
new Version(
2525
"1.1",
2626
new LiquibaseMigration("update/gitbucket-page_1.1.xml"),
27-
new SqlMigration("update/gitbucket-page_1.1.sql")
28-
),
27+
new SqlMigration("update/gitbucket-page_1.1.sql")),
2928
new Version("1.2"),
3029
new Version("1.3"),
3130
new Version("1.4.0"),
3231
new Version("1.5.0"),
33-
new Version("1.6.0")
34-
)
32+
new Version("1.6.0"))
3533

3634
override val controllers: Seq[(String, ControllerBase)] = Seq(
37-
"/*" -> new PagesController
38-
)
35+
"/*" -> new PagesController)
3936

4037
override val repositorySettingTabs = Seq(
41-
(repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages"))
42-
)
38+
(repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages")))
4339

4440
override val repositoryHooks = Seq(
45-
new PagesHook
46-
)
41+
new PagesHook)
4742
}
4843

src/main/scala/gitbucket/plugin/model/Pages.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ object PageSourceType {
3636
case class Page(
3737
userName: String,
3838
repositoryName: String,
39-
source: PageSourceType
40-
)
39+
source: PageSourceType)

src/main/scala/gitbucket/plugin/pages/pages.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ trait PagesControllerBase extends ControllerBase {
3030
import PagesControllerBase._
3131

3232
val optionsForm = mapping(
33-
"source" -> trim(label("Pages Source", text(required, pagesOption)))
34-
)(
35-
(source) => OptionsForm(PageSourceType.valueOf(source))
36-
)
33+
"source" -> trim(label("Pages Source", text(required, pagesOption))))(
34+
(source) => OptionsForm(PageSourceType.valueOf(source)))
3735

3836
val PAGES_BRANCHES = List("gb-pages", "gh-pages")
3937

0 commit comments

Comments
 (0)