Merge pull request #7465 from xmake-io/modules

update module versions again

6 files changed, 72 insertions, 32 deletions

diff --git a/tests/projects/c++/modules/multiple_runtimes/test.lua b/tests/projects/c++/modules/multiple_runtimes/test.lua
index 4f9773dd8..936a7ecf0 100644
--- a/tests/projects/c++/modules/multiple_runtimes/test.lua
+++ b/tests/projects/c++/modules/multiple_runtimes/test.lua
@@ -3,9 +3,19 @@ import("core.base.semver")
 import("core.tool.toolchain")
 import("utils.ci.is_running", {alias = "ci_is_running"})
 
-local CLANG_MIN_VER = "19"
-local GCC_MIN_VER = "15"
-local MSVC_MIN_VER = "14.35"
+local _CLANG_MIN_VER = "19"
+local _GCC_MIN_VER = "15"
+local _MSVC_MIN_VER = "14.35"
+
+function clang_min_ver()
+    return _CLANG_MIN_VER
+end
+function gcc_min_ver()
+    return _GCC_MIN_VER
+end
+function msvc_min_ver()
+    return _MSVC_MIN_VER
+end
 
 function _check_tool_version(name, min_ver)
     local tool = find_tool(name, {version = true})
@@ -34,7 +44,7 @@ end
 
 function main(_)
     if is_subhost("windows") then
-        if not _check_msvc_version(MSVC_MIN_VER) then
+        if not _check_msvc_version(msvc_min_ver()) then
             return
         end
         -- on windows, llvm libc++ std module is currently not supported, uncommend when supported
@@ -42,7 +52,7 @@ function main(_)
         --     return
         -- end
     elseif is_host("linux") then
-        if not _check_tool_version("gcc", GCC_MIN_VER) or not _check_tool_version("clang", CLANG_MIN_VER) then
+        if not _check_tool_version("gcc", gcc_min_ver()) or not _check_tool_version("clang", clang_min_ver()) then
             return
         end
     else
diff --git a/tests/projects/c++/modules/reuse_strict_private_defines/test.lua b/tests/projects/c++/modules/reuse_strict_private_defines/test.lua
index 6e3304b68..7f136218e 100644
--- a/tests/projects/c++/modules/reuse_strict_private_defines/test.lua
+++ b/tests/projects/c++/modules/reuse_strict_private_defines/test.lua
@@ -1,10 +1,6 @@
 inherit(".test_base")
 import("utils.ci.is_running", {alias = "ci_is_running"})
 
-local CLANG_MIN_VER = is_subhost("windows") and "19" or "17"
-local GCC_MIN_VER = "11"
-local MSVC_MIN_VER = "14.29"
-
 local PRIVATE_DEFINE = "PRIVATE_DEP_DEFINE_DO_NOT_PROPAGATE"
 local PUBLIC_SYSINCLUDEDIR = path.translate("src/include")
 
@@ -40,8 +36,8 @@ function _build()
 end
 
 function main(_)
-    local clang_options = {compiler = "clang", version = CLANG_MIN_VER, build = _build}
-    local gcc_options = {compiler = "gcc", version = GCC_MIN_VER, build = _build}
-    local msvc_options = {version = MSVC_MIN_VER, build = _build}
+    local clang_options = {compiler = "clang", version = clang_min_ver(), build = _build}
+    local gcc_options = {compiler = "gcc", version = gcc_min_ver(), build = _build}
+    local msvc_options = {version = msvc_min_ver(), build = _build}
     run_tests(clang_options, gcc_options, msvc_options)
 end
diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua
index e3bf83f83..a63f254d5 100644
--- a/tests/projects/c++/modules/test_headerunits.lua
+++ b/tests/projects/c++/modules/test_headerunits.lua
@@ -1,6 +1,10 @@
 inherit("test_base")
 
-local MSVC_MIN_VER = "14.30"
+local _MSVC_MIN_VER = "14.30"
+
+function msvc_min_ver()
+    return _MSVC_MIN_VER
+end
 
 function main(t)
     local gcc_options = {fallbackscanner = true, compiler = "gcc", version = gcc_min_ver()}
@@ -9,7 +13,7 @@ function main(t)
     if os.arch() == "arm64" or is_subhost("msys") then
         gcc_options = nil
     end
-    local msvc_options = {version = MSVC_MIN_VER}
+    local msvc_options = {version = msvc_min_ver()}
     -- skip clang tests, headerunits with clang is not stable
     run_tests(nil, gcc_options, msvc_options)
 end
diff --git a/tests/projects/c++/modules/test_partitions.lua b/tests/projects/c++/modules/test_partitions.lua
index 42e30fb35..5e346809c 100644
--- a/tests/projects/c++/modules/test_partitions.lua
+++ b/tests/projects/c++/modules/test_partitions.lua
@@ -1,12 +1,22 @@
 inherit("test_base")
 
-local CLANG_MIN_VER = is_subhost("windows") and "19" or "18"
-local GCC_MIN_VER = "13"
-local MSVC_MIN_VER = "14.30"
+local _CLANG_MIN_VER = is_subhost("windows") and "19" or "18"
+local _GCC_MIN_VER = "13"
+local _MSVC_MIN_VER = "14.30"
+
+function clang_min_ver()
+    return _CLANG_MIN_VER
+end
+function gcc_min_ver()
+    return _GCC_MIN_VER
+end
+function msvc_min_ver()
+    return _MSVC_MIN_VER
+end
 
 function main(_)
-    local clang_options = {compiler = "clang", version = CLANG_MIN_VER}
-    local gcc_options = {compiler = "gcc", version = GCC_MIN_VER}
-    local msvc_options = {version = MSVC_MIN_VER}
+    local clang_options = {compiler = "clang", version = clang_min_ver()}
+    local gcc_options = {compiler = "gcc", version = gcc_min_ver()}
+    local msvc_options = {version = msvc_min_ver()}
     run_tests(clang_options, gcc_options, msvc_options)
 end
diff --git a/tests/projects/c++/modules/test_stdmodules.lua b/tests/projects/c++/modules/test_stdmodules.lua
index e7d6591a7..6de6df69d 100644
--- a/tests/projects/c++/modules/test_stdmodules.lua
+++ b/tests/projects/c++/modules/test_stdmodules.lua
@@ -1,12 +1,22 @@
 inherit("test_base")
 
-local CLANG_MIN_VER = "19"
-local GCC_MIN_VER = "15"
-local MSVC_MIN_VER = "14.35"
+local _CLANG_MIN_VER = "19"
+local _GCC_MIN_VER = "15"
+local _MSVC_MIN_VER = "14.35"
+
+function clang_min_ver()
+    return _CLANG_MIN_VER
+end
+function gcc_min_ver()
+    return _GCC_MIN_VER
+end
+function msvc_min_ver()
+    return _MSVC_MIN_VER
+end
 
 function main(_)
-    local clang_options = {stdmodule = true, compiler = "clang", version = CLANG_MIN_VER}
-    local gcc_options = {stdmodule = true, compiler = "gcc", version = GCC_MIN_VER}
+    local clang_options = {stdmodule = true, compiler = "clang", version = clang_min_ver()}
+    local gcc_options = {stdmodule = true, compiler = "gcc", version = gcc_min_ver()}
     -- latest mingw gcc 15.1 is broken
     --  error: F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:105:3: error: 'int std::__glibcxx_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)'
     --   105 |   __glibcxx_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
@@ -27,6 +37,6 @@ function main(_)
     if is_subhost("msys") then
         gcc_options = nil
     end
-    local msvc_options = {stdmodule = true, version = MSVC_MIN_VER}
+    local msvc_options = {stdmodule = true, version = msvc_min_ver()}
     run_tests(clang_options, gcc_options, msvc_options)
 end
diff --git a/tests/projects/c++/modules/test_xmake_test_stdmodules.lua b/tests/projects/c++/modules/test_xmake_test_stdmodules.lua
index ab28eaf86..22ff2ba77 100644
--- a/tests/projects/c++/modules/test_xmake_test_stdmodules.lua
+++ b/tests/projects/c++/modules/test_xmake_test_stdmodules.lua
@@ -1,9 +1,19 @@
 inherit("test_base")
 import("utils.ci.is_running", {alias = "ci_is_running"})
 
-local CLANG_MIN_VER = "19"
-local GCC_MIN_VER = "15"
-local MSVC_MIN_VER = "14.35"
+local _CLANG_MIN_VER = "19"
+local _GCC_MIN_VER = "15"
+local _MSVC_MIN_VER = "14.35"
+
+function clang_min_ver()
+    return _CLANG_MIN_VER
+end
+function gcc_min_ver()
+    return _GCC_MIN_VER
+end
+function msvc_min_ver()
+    return _MSVC_MIN_VER
+end
 
 function run_xmake_test(...)
     local flags = ""
@@ -15,8 +25,8 @@ function run_xmake_test(...)
 end
 
 function main(_)
-    local clang_options = {stdmodule = true, compiler = "clang", version = CLANG_MIN_VER, after_build = run_xmake_test}
-    local gcc_options = {stdmodule = true, compiler = "gcc", version = GCC_MIN_VER, after_build = run_xmake_test}
+    local clang_options = {stdmodule = true, compiler = "clang", version = clang_min_ver(), after_build = run_xmake_test}
+    local gcc_options = {stdmodule = true, compiler = "gcc", version = gcc_min_ver(), after_build = run_xmake_test}
     -- latest mingw gcc 15.1 is broken
     --  error: F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:105:3: error: 'int std::__glibcxx_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)'
     --   105 |   __glibcxx_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
@@ -37,6 +47,6 @@ function main(_)
     if is_subhost("msys") then
         gcc_options = nil
     end
-    local msvc_options = {stdmodule = true, version = MSVC_MIN_VER}
+    local msvc_options = {stdmodule = true, version = msvc_min_ver()}
     run_tests(clang_options, gcc_options, msvc_options)
 end