Merge pull request #57 from JohanMabille/upgrade_nlohmann

Upgraded to nlohmann_json 3.12 and compatible xwidgets and xcanvas

Author: JohanMabille

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install micromamba
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment-dev.yml
 

CMakeLists.txt

@@ -91,8 +91,8 @@ endif()
 
 
 set(xeus_REQUIRED_VERSION 5.0.0)
-set(xwidgets_REQUIRED_VERSION 0.29.0)
-set(xcanvas_REQUIRED_VERSION 0.5.0)
+set(xwidgets_REQUIRED_VERSION 0.29.2)
+set(xcanvas_REQUIRED_VERSION 0.6.1)
 set(xproperty_REQUIRED_VERSION 0.12.0)
 set(Lua_REQUIRED_VERSION 5.3.4)
 

environment-dev.yml

@@ -12,8 +12,8 @@ dependencies:
   - cppzmq
   - lua>=5.2.0
   - openlibm # [linux]
-  - xwidgets >=0.29
-  - xcanvas>=0.4.2
+  - xwidgets >=0.29.2
+  - xcanvas>=0.6.1
   # to try it out
   - jupyterlab
   # Test dependencies

include/xeus-lua/xinterpreter.hpp

@@ -27,9 +27,9 @@ extern "C" {
 # include "lauxlib.h"
 # include "lualib.h"
 #else
-#include "luajit-2.0/lua.h"
-#include "luajit-2.0/lauxlib.h"
-#include "luajit-2.0/lualib.h"
+#include "luajit-2.1/lua.h"
+#include "luajit-2.1/lauxlib.h"
+#include "luajit-2.1/lualib.h"
 #endif
 }
 namespace nl = nlohmann;