From e552f06d86752edd77aedf50b9b49e59f6de1b65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:38:52 +0530 Subject: [PATCH 1/7] chore(doc): automatic vimdoc update (#356) Co-authored-by: s1n7ax <18459807+s1n7ax@users.noreply.github.com> --- doc/nvim-java.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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', + }, + }, } < From d25bc1c55b4cea53f6174b2e2171ed8519113bc5 Mon Sep 17 00:00:00 2001 From: Zeioth Date: Fri, 9 May 2025 06:32:26 +0200 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=90=9Bfix(`mason=20v2.0`):=20Compatib?= =?UTF-8?q?ility=20added=20(#376)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛fix(`mason v2.0`): Compatibility added * format: stylua --- lua/java/utils/mason.lua | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/lua/java/utils/mason.lua b/lua/java/utils/mason.lua index 6e239a2..74ffdec 100644 --- a/lua/java/utils/mason.lua +++ b/lua/java/utils/mason.lua @@ -6,42 +6,33 @@ local await = async.wait_handle_ok local M = {} function M.is_available(package_name, package_version) + -- guard clause local has_pkg = mason_reg.has_package(package_name) - if not has_pkg then return false end - local has_version = false - + -- check local pkg = mason_reg.get_package(package_name) - pkg:get_installed_version(function(success, version) - if success and version == package_version then - has_version = true - end - end) + local version = pkg:get_installed_version() + local has_version = version == package_version return has_version end function M.is_installed(package_name, package_version) + -- guard clause local pkg = mason_reg.get_package(package_name) local is_installed = pkg:is_installed() - if not is_installed then return false end - local installed_version - pkg:get_installed_version(function(ok, version) - if not ok then - return - end - - installed_version = version - end) + -- check + local installed_version = pkg:get_installed_version() + is_installed = installed_version == package_version - return installed_version == package_version + return is_installed end function M.is_outdated(packages) From f92cadf7bdd01f5cfe383c8e725a283ffcc3685d Mon Sep 17 00:00:00 2001 From: s1n7ax Date: Sun, 18 May 2025 00:35:02 +0530 Subject: [PATCH 3/7] =?UTF-8?q?Revert=20"=F0=9F=90=9Bfix(`mason=20v2.0`):?= =?UTF-8?q?=20Compatibility=20added=20(#376)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d25bc1c55b4cea53f6174b2e2171ed8519113bc5. --- lua/java/utils/mason.lua | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lua/java/utils/mason.lua b/lua/java/utils/mason.lua index 74ffdec..6e239a2 100644 --- a/lua/java/utils/mason.lua +++ b/lua/java/utils/mason.lua @@ -6,33 +6,42 @@ local await = async.wait_handle_ok local M = {} function M.is_available(package_name, package_version) - -- guard clause local has_pkg = mason_reg.has_package(package_name) + if not has_pkg then return false end - -- check + local has_version = false + local pkg = mason_reg.get_package(package_name) - local version = pkg:get_installed_version() - local has_version = version == package_version + pkg:get_installed_version(function(success, version) + if success and version == package_version then + has_version = true + end + end) return has_version end function M.is_installed(package_name, package_version) - -- guard clause local pkg = mason_reg.get_package(package_name) local is_installed = pkg:is_installed() + if not is_installed then return false end - -- check - local installed_version = pkg:get_installed_version() - is_installed = installed_version == package_version + local installed_version + pkg:get_installed_version(function(ok, version) + if not ok then + return + end + + installed_version = version + end) - return is_installed + return installed_version == package_version end function M.is_outdated(packages) From 7c2e81caa301b0d1bc7992b88981af883b3b5d6b Mon Sep 17 00:00:00 2001 From: Jx <103049321+JxJxxJxJ@users.noreply.github.com> Date: Sat, 24 May 2025 08:57:31 -0300 Subject: [PATCH 4/7] fix(typo): project vise -> project-wise (#390) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { From 4fd68c4025acaafb9efbf2e0cf69e017bcc4476c Mon Sep 17 00:00:00 2001 From: logrusx <45463882+logrusx@users.noreply.github.com> Date: Mon, 4 Aug 2025 08:33:41 +0300 Subject: [PATCH 5/7] fix: mason registry verification fails (#405) * fix: mason registry verification fails * chore: code formatting --------- Co-authored-by: s1n7ax --- lua/java.lua | 2 ++ lua/java/startup/mason-dep.lua | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) 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/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) From 2776094c745af0d99b5acb24a4594d85b4f99545 Mon Sep 17 00:00:00 2001 From: logrusx <45463882+logrusx@users.noreply.github.com> Date: Mon, 4 Aug 2025 08:40:27 +0300 Subject: [PATCH 6/7] fix: java-debug-adapter doean't install (#407) --- lua/java/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = { From 083114902630de67dd82fda73892966748a1eb7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 10:39:03 +0530 Subject: [PATCH 7/7] chore(main): release 2.1.2 (#392) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) 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)