diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c78ea7..7cda89f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [2.1.2](https://github.com/nvim-java/nvim-java/compare/v2.1.1...v2.1.2) (2025-08-04) + + +### Bug Fixes + +* java-debug-adapter doean't install ([#407](https://github.com/nvim-java/nvim-java/issues/407)) ([2776094](https://github.com/nvim-java/nvim-java/commit/2776094c745af0d99b5acb24a4594d85b4f99545)) +* mason registry verification fails ([#405](https://github.com/nvim-java/nvim-java/issues/405)) ([4fd68c4](https://github.com/nvim-java/nvim-java/commit/4fd68c4025acaafb9efbf2e0cf69e017bcc4476c)) +* **typo:** project vise -> project-wise ([#390](https://github.com/nvim-java/nvim-java/issues/390)) ([7c2e81c](https://github.com/nvim-java/nvim-java/commit/7c2e81caa301b0d1bc7992b88981af883b3b5d6b)) + ## [2.1.1](https://github.com/nvim-java/nvim-java/compare/v2.1.0...v2.1.1) (2025-02-16) diff --git a/README.md b/README.md index 3e2328c..c540b14 100644 --- a/README.md +++ b/README.md @@ -288,8 +288,8 @@ require('java').settings.change_runtime() ### Method 1 [Neoconf](https://github.com/folke/neoconf.nvim) can be used to manage LSP -setting including jdtls. Neoconf allows global configuration as well as project -vice configurations. Here is how you can set Jdtls setting on `neoconf.json` +setting including jdtls. Neoconf allows global configuration as well as project-wise +configurations. Here is how you can set Jdtls setting on `neoconf.json` ```json { diff --git a/doc/nvim-java.txt b/doc/nvim-java.txt index 6d24539..31ad3be 100644 --- a/doc/nvim-java.txt +++ b/doc/nvim-java.txt @@ -1,4 +1,4 @@ -*nvim-java.txt* For Neovim >= 0.9.4 Last change: 2024 December 24 +*nvim-java.txt* For Neovim >= 0.9.4 Last change: 2025 February 16 ============================================================================== Table of Contents *nvim-java-table-of-contents* @@ -388,7 +388,7 @@ want, following options are available -- load java test plugins java_test = { enable = true, - version = '0.43.0', + version = '0.40.1', }, -- load java debugger plugins @@ -399,7 +399,7 @@ want, following options are available spring_boot_tools = { enable = true, - version = '1.59.0', + version = '1.55.1', }, jdk = { @@ -438,6 +438,14 @@ want, following options are available -- will stop setup invalid_mason_registry = false, }, + + mason = { + -- These mason registries will be prepended to the existing mason + -- configuration + registries = { + 'github:nvim-java/mason-registry', + }, + }, } < diff --git a/lua/java.lua b/lua/java.lua index 13c8b25..3e3515d 100644 --- a/lua/java.lua +++ b/lua/java.lua @@ -28,6 +28,8 @@ function M.setup(custom_config) { pattern = 'JavaSetup', data = { config = config } } ) + mason_dep.add_custom_registries(config.mason.registries) + if not startup_check() then return end diff --git a/lua/java/config.lua b/lua/java/config.lua index 7383646..47467ee 100644 --- a/lua/java/config.lua +++ b/lua/java/config.lua @@ -40,7 +40,7 @@ local config = { -- load java debugger plugins java_debug_adapter = { enable = true, - version = '0.58.1', + version = '0.58.2', }, spring_boot_tools = { diff --git a/lua/java/startup/mason-dep.lua b/lua/java/startup/mason-dep.lua index 2e00762..c424b04 100644 --- a/lua/java/startup/mason-dep.lua +++ b/lua/java/startup/mason-dep.lua @@ -11,18 +11,22 @@ local List = require('java-core.utils.list') local M = {} ----Install mason package dependencies for nvim-java ----@param config java.Config -function M.install(config) +---Add custom registries to mason +---@param registries java.Config +function M.add_custom_registries(registries) local mason_default_config = require('mason.settings').current - local registries = list_util - :new(config.mason.registries) - :concat(mason_default_config.registries) + local new_registries = + list_util:new(registries):concat(mason_default_config.registries) require('mason').setup({ - registries = registries, + registries = new_registries, }) +end + +---Install mason package dependencies for nvim-java +---@param config java.Config +function M.install(config) local packages = M.get_pkg_list(config) local is_outdated = mason_util.is_outdated(packages)