Merge pull request #12 from gitbucket-plugins/plugin-registry

Bump to sbt-gitbucket-plugin 1.3.0 to be hosted by the plugin registry

Author: takezoe

README.md

@@ -9,18 +9,19 @@ Version
 ---
 
 Plugin version|GitBucket version
-:---|:---
-6.0|4.23+
-5.0|4.21+
-4.0|4.16+
-3.x|4.11+
-2.0.0| 4.10+
-1.0.x|4.9.x
+:-------------|:----------------
+6.1.x         |4.26+
+6.0.x         |4.23+
+5.0.x         |4.21+
+4.0.x         |4.16+
+3.0.x         |4.11+
+2.0.0         |4.10+
+1.0.x         |4.9.x
 
 Download
 ---
 
-You can download the JAR file from the [Release](https://github.com/gitbucket-plugins/gitbucket-explorer-plugin/releases) page.
+You can download the JAR file from the [Release](https://github.com/gitbucket-plugins/gitbucket-explorer-plugin/releases).
 
 Installation
 ---
@@ -30,13 +31,16 @@ Copy the downloaded plug-in JAR file to your `GITBUCKET_HOME/plugins` directory,
 Building
 ---
 Pre-requisites are Node, NPM, SBT, and Java 8.
- - Run `npm install` to install all node dependencies.
- - Run `npm run-script release` to create a **complete** release (this will call SBT too).
+- Run `npm install` to install all node dependencies.
+- Run `npm run-script release` to create a **complete** release (this will call SBT too).
 
 See `package.json` for more details.
 
 Releases
 ---
+### 6.1.0 - 1 Jul 2018
+- Bump sbt-gitbucket-plugin to 1.3.0 to be hosted by the [plugin registry](https://plugins.gitbucket-community.org/)
+
 ### 6.0.0 - 23 Apr 2018
 - Bump to GitBucket 4.23.1
 

build.sbt

@@ -1,12 +1,8 @@
 organization := "io.github.gitbucket"
 name := "gitbucket-explorer-plugin"
-version := "6.0.0"
-scalaVersion := "2.12.4"
-gitbucketVersion := "4.23.1"
-
-libraryDependencies ++= Seq(
-  "javax.servlet"         % "javax.servlet-api" % "3.1.0" % "provided"
-)
+version := "6.1.0"
+scalaVersion := "2.12.0"
+gitbucketVersion := "4.26.0"
 
 scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")

package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "browserify -t babelify ./scripts/index.js -o ./src/main/resources/explorer/assets/bundle.js && sbt package",
+    "build": "browserify -t babelify ./scripts/index.js -o ./src/main/resources/explorer/assets/bundle.js && sbt assembly",
     "watch": "watchify -t babelify ./scripts/index.js -o ./src/main/resources/explorer/assets/bundle.js",
-    "release": "set NODE_ENV=production && browserify ./scripts/index.js -t babelify -t envify | uglifyjs -c warnings=false > ./src/main/resources/explorer/assets/bundle.js && sbt clean package"
+    "release": "set NODE_ENV=production && browserify ./scripts/index.js -t babelify -t envify | uglifyjs -c warnings=false > ./src/main/resources/explorer/assets/bundle.js && sbt clean assembly"
   },
   "author": "tomoki1207",
   "license": "MIT",

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.1.0
+sbt.version = 1.1.6

project/plugins.sbt

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

src/main/scala/Plugin.scala

@@ -21,7 +21,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("3.0.0"),
     new Version("4.0.0"),
     new Version("5.0.0"),
-    new Version("6.0.0")
+    new Version("6.0.0"),
+    new Version("6.1.0")
   )
 
   override val controllers = Seq(