Release 3.5.5

avsej · avsej · commit 42f03e61b6b7 · 2025-01-24T17:23:22.000-08:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The library has been tested with MRI 3.1, 3.2 and 3.3. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.5.4"
+gem "couchbase", "3.5.5"
 ```
 
 And then execute:
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -77,7 +77,6 @@ target_link_libraries(
           Microsoft.GSL::GSL
           asio
           taocpp::json
-          fmt::fmt
           spdlog::spdlog
           snappy)
 if(RUBY_LIBRUBY)
diff --git a/ext/couchbase b/ext/couchbase
@@ -1 +1 @@
-Subproject commit c24912fcbbec5c5ebe3c2b54bb3013300ae69ed7
+Subproject commit 24dca979ec842ce200aaa1741f1271a4a61c837d
diff --git a/ext/rcb_analytics.cxx b/ext/rcb_analytics.cxx
@@ -36,7 +36,7 @@
 #include <core/operations/management/analytics_link_get_all.hxx>
 #include <core/operations/management/analytics_link_replace.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
diff --git a/ext/rcb_backend.cxx b/ext/rcb_backend.cxx
@@ -22,7 +22,7 @@
 #include <core/utils/connection_string.hxx>
 
 #include <asio/io_context.hpp>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
diff --git a/ext/rcb_buckets.cxx b/ext/rcb_buckets.cxx
@@ -24,7 +24,7 @@
 #include <core/operations/management/bucket_get_all.hxx>
 #include <core/operations/management/bucket_update.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
diff --git a/ext/rcb_collections.cxx b/ext/rcb_collections.cxx
@@ -23,7 +23,7 @@
 #include <core/operations/management/scope_drop.hxx>
 #include <core/operations/management/scope_get_all.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 #include <memory>
diff --git a/ext/rcb_diagnostics.cxx b/ext/rcb_diagnostics.cxx
@@ -17,7 +17,7 @@
 
 #include <core/cluster.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 
diff --git a/ext/rcb_exceptions.cxx b/ext/rcb_exceptions.cxx
@@ -17,7 +17,6 @@
 
 #include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
 
 #include <core/error_context/analytics.hxx>
 #include <core/error_context/http.hxx>
@@ -27,7 +26,9 @@
 #include <core/error_context/view.hxx>
 #include <core/fmt/key_value_status_code.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
+
+#include <couchbase/fmt/retry_reason.hxx>
 
 #include "rcb_exceptions.hxx"
 #include "rcb_utils.hxx"
diff --git a/ext/rcb_extras.cxx b/ext/rcb_extras.cxx
@@ -26,7 +26,7 @@
 #include <core/utils/unsigned_leb128.hxx>
 #include <core/utils/url_codec.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <snappy.h>
 
 #include <future>
diff --git a/ext/rcb_range_scan.cxx b/ext/rcb_range_scan.cxx
@@ -24,7 +24,7 @@
 #include <core/scan_result.hxx>
 #include <couchbase/error_codes.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <future>
 
diff --git a/ext/rcb_search.cxx b/ext/rcb_search.cxx
@@ -30,7 +30,7 @@
 #include <core/operations/management/search_index_get_stats.hxx>
 #include <core/operations/management/search_index_upsert.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <gsl/narrow>
 
 #include <future>
diff --git a/ext/rcb_users.cxx b/ext/rcb_users.cxx
@@ -28,8 +28,8 @@
 #include <core/operations/management/user_get_all.hxx>
 #include <core/operations/management/user_upsert.hxx>
 
-#include <fmt/core.h>
-#include <fmt/ranges.h>
+#include <spdlog/fmt/bundled/core.h>
+#include <spdlog/fmt/bundled/ranges.h>
 
 #include <future>
 #include <memory>
diff --git a/lib/couchbase/version.rb b/lib/couchbase/version.rb
@@ -21,5 +21,5 @@ module Couchbase
   #   $ ruby -rcouchbase -e 'pp Couchbase::VERSION'
   #   {:sdk=>"3.4.0", :ruby_abi=>"3.1.0", :revision=>"416fe68e6029ec8a4c40611cf6e6b30d3b90d20f"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.5.4")
+  VERSION.update(:sdk => "3.5.5")
 end
