macos ci fixes

llarp/apple/CMakeLists.txt

@@ -6,13 +6,11 @@ if (BUILD_SHARED_LIBS OR NOT BUILD_STATIC_DEPS OR NOT STATIC_LINK)
   message(FATAL_ERROR "macOS builds require a full static build; perhaps use the contrib/macos.sh script to build?")
 endif()
 
-# god made apple so that man may suffer
-
+# god (steve jobs) made apple so that man may suffer
 find_library(FOUNDATION Foundation REQUIRED)
 find_library(NETEXT NetworkExtension REQUIRED)
 find_library(COREFOUNDATION CoreFoundation REQUIRED)
 
-target_sources(lokinet-util PRIVATE apple_logger.cpp)
 target_link_libraries(lokinet-util PUBLIC ${FOUNDATION})
 
 target_sources(lokinet-platform PRIVATE vpn_platform.cpp vpn_interface.cpp route_manager.cpp context_wrapper.cpp)

llarp/apple/context_wrapper.cpp

@@ -4,9 +4,9 @@
 #include <llarp/net/ip_packet.hpp>
 #include <llarp/config/config.hpp>
 #include <llarp/util/fs.hpp>
-#include <llarp/util/logging/buffer.hpp>
 #include <uvw/loop.h>
-#include <llarp/util/logging/logger.hpp>
+#include <llarp/util/logging.hpp>
+#include <llarp/util/logging/buffer.hpp>
 #include <llarp/util/logging/callback_sink.hpp>
 #include "vpn_interface.hpp"
 #include "context_wrapper.h"
@@ -35,10 +35,11 @@ const uint16_t dns_trampoline_port = 1053;
 void*
 llarp_apple_init(llarp_apple_config* appleconf)
 {
-  llarp::log::ReplaceLogger(std::make_shared<llarp::log::CallbackSink_mt>(
+  llarp::log::clear_sinks();
+  llarp::log::add_sink(std::make_shared<llarp::logging::CallbackSink_mt>(
       [](const char* msg, void* nslog) { reinterpret_cast<ns_logger_callback>(nslog)(msg); },
       nullptr,
-      appleconf->ns_logger));
+      reinterpret_cast<void*>(appleconf->ns_logger)));
 
   try
   {