From 17d0a629027263ab4c4496d46a6557276dfaa4d2 Mon Sep 17 00:00:00 2001
From: mcbarton <matthew.c.barton@hotmail.co.uk>
Date: Mon, 26 Jan 2026 13:39:42 +0000
Subject: [PATCH] Update to CppInterOp v1.8.0

---
 .github/workflows/main.yml        | 3 ---
 CMakeLists.txt                    | 2 +-
 README.md                         | 2 +-
 environment-dev.yml               | 4 ++--
 environment-wasm-host.yml         | 2 +-
 include/xeus-cpp/xinterpreter.hpp | 2 +-
 src/xinspect.cpp                  | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b04cf21b..0ed0adec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,9 +44,6 @@ jobs:
           - name: osx15-x86
             os: macos-15-intel
             micromamba_shell_init: bash
-          - name: osx14-arm
-            os: macos-14
-            micromamba_shell_init: bash
           - name: osx15-arm
             os: macos-15
             micromamba_shell_init: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3361f5f5..18f7fbf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
 
 set(xeus_REQUIRED_VERSION 5.0.0)
 set(xeus_zmq_REQUIRED_VERSION 3.0.0)
-set(CppInterOp_REQUIRED_VERSION 1.7.0)
+set(CppInterOp_REQUIRED_VERSION 1.8.0)
 set(xeus_lite_REQUIRED_VERSION 3.2.1)
 
 if (NOT TARGET xeus AND NOT TARGET xeus-static)
diff --git a/README.md b/README.md
index 06068c4b..377d3c7c 100644
--- a/README.md
+++ b/README.md
@@ -207,7 +207,7 @@ http://xeus-cpp.readthedocs.io
 
 | `xeus-cpp` | `xeus-zmq`      | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` |
 |------------|-----------------|--------------|-----------|---------------|-----------------|
-|  main      |  3.1.0 | 1.7.0      | 1.15    | 3.2    | 3.12.0   |
+|  main      |  3.1.0 | 1.8.0      | 1.15    | 3.2    | 3.12.0   |
 
 ## Contributing
 
diff --git a/environment-dev.yml b/environment-dev.yml
index a6a7cf58..3a9ad8fa 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -5,13 +5,13 @@ dependencies:
   # Build dependencies
   - make
   - cmake
-  - cxx-compiler=1.7.0
+  - cxx-compiler
   # Host dependencies
   - xeus>=5.0.0
   - xeus-zmq<4.0
   - nlohmann_json
   - nlohmann_json-abi
-  - CppInterOp
+  - CppInterOp>1.7.0
   - pugixml
   - cpp-argparse
   # Test dependencies
diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml
index 0230026c..a7ee0ada 100644
--- a/environment-wasm-host.yml
+++ b/environment-wasm-host.yml
@@ -7,7 +7,7 @@ dependencies:
   - nlohmann_json-abi
   - xeus-lite
   - xeus
-  - CppInterOp
+  - CppInterOp>1.7.0
   - cpp-argparse
   - pugixml
   - doctest
diff --git a/include/xeus-cpp/xinterpreter.hpp b/include/xeus-cpp/xinterpreter.hpp
index 25eeb049..92b4e2c7 100644
--- a/include/xeus-cpp/xinterpreter.hpp
+++ b/include/xeus-cpp/xinterpreter.hpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "clang/Interpreter/CppInterOp.h" // from CppInterOp package
+#include <CppInterOp/CppInterOp.h>
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/xinspect.cpp b/src/xinspect.cpp
index 2511a5ac..09a1933d 100644
--- a/src/xinspect.cpp
+++ b/src/xinspect.cpp
@@ -14,7 +14,7 @@
 
 #include "xinspect.hpp"
 
-#include "clang/Interpreter/CppInterOp.h"
+#include <CppInterOp/CppInterOp.h>
 
 namespace xcpp
 {