diff --git a/src/main/resources/plugins/gitbucket-emoji-plugin_2.12-4.4.0.jar b/src/main/resources/plugins/gitbucket-emoji-plugin_2.12-4.4.0.jar new file mode 100644 index 0000000..9f4fdec --- /dev/null +++ b/src/main/resources/plugins/gitbucket-emoji-plugin_2.12-4.4.0.jar Binary files differ diff --git a/src/main/resources/plugins/plugins.json b/src/main/resources/plugins/plugins.json index 64de137..25c66d5 100644 --- a/src/main/resources/plugins/plugins.json +++ b/src/main/resources/plugins/plugins.json @@ -1,23 +1,8 @@ [ { - "id": "gist", - "name": "Gist Plugin", - "description": "Provides Gist feature on GitBucket.", - "provider": "GitBucket Organization", - "homepage": "https://github.com/gitbucket/gitbucket-gist-plugin", - "versions": [ - { - "version": "4.9.0", - "range": ">4.14.0", - "file": "gitbucket-gist-plugin_2.12-4.9.0.jar" - } - ], - "default": false - }, - { "id": "notifications", - "name": "Notification Plugin", - "description": "Send issues and pull request notification via email.", + "name": "Notifications Plugin", + "description": "Provides Notifications feature on GitBucket.", "provider": "GitBucket Organization", "homepage": "https://github.com/gitbucket/gitbucket-notifications-plugin", "versions": [ @@ -28,6 +13,35 @@ } ], "default": true + }, + { + "id": "emoji", + "name": "Emoji Plugin", + "description": "Provides Emoji support for GitBucket.", + "provider": "GitBucket Organization", + "homepage": "https://github.com/gitbucket/gitbucket-emoji-plugin", + "versions": [ + { + "version": "4.4.0", + "range": ">=4.10.0", + "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar" + } + ], + "default": true + }, + { + "id": "gist", + "name": "Gist Plugin", + "description": "Provides Gist feature on GitBucket.", + "provider": "GitBucket Organization", + "homepage": "https://github.com/gitbucket/gitbucket-gist-plugin", + "versions": [ + { + "version": "4.9.0", + "range": ">=4.14.0", + "file": "gitbucket-gist-plugin_2.12-4.9.0.jar" + } + ], + "default": false } - ] diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala index 8c86bee..eb10daa 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala @@ -236,12 +236,10 @@ initialize(context, settings, conn) } - private class PluginJarFileFilter extends FilenameFilter { - override def accept(dir: File, name: String): Boolean = name.endsWith(".jar") - } - private def listPluginJars(dir: File): Seq[File] = { - dir.listFiles(new PluginJarFileFilter()).map { file => + dir.listFiles(new FilenameFilter { + override def accept(dir: File, name: String): Boolean = name.endsWith(".jar") + }).map { file => val Array(name, version) = file.getName.split("_2.12-") (name, Semver.valueOf(version.replaceFirst("\\.jar$", "")), file) }.groupBy { case (name, _, _) =>