Merge branch 'dev'

Author: gershnik

.github/workflows/publish.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   main:
-    runs-on: macOS-13
+    runs-on: macOS-latest
     permissions: write-all
     steps:
     - name: Checkout

.github/workflows/test.yml

@@ -15,13 +15,23 @@ on:
       - 'tools/create-release.py'
       - '.github/workflows/publish.yml'
 
-env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app
-
 jobs:
-  main:
-    runs-on: macOS-13
-    
+  mac:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+        - { os: macOS-13, xcode: '15.0' }
+        - { os: macOS-13, xcode: '14.3' }
+        - { os: macos-14, xcode: '15.4.0' }
+        - { os: macos-15, xcode: '16.4.0' }
+        - { os: macos-15-intel, xcode: '16.4.0' }
+        - { os: macos-26, xcode: '26.0' }
+
+    env: 
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -35,7 +45,17 @@ jobs:
       run: DerivedData/Build/Products/Release/test
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - {os: ubuntu-22.04, version: 16 }
+        - {os: ubuntu-24.04, version: 17 }
+        - {os: ubuntu-24.04, version: 18 }
+        - {os: ubuntu-24.04, version: 19 }
+        - {os: ubuntu-24.04, version: 20 }
+        - {os: ubuntu-24.04, version: 21 }
 
     steps:
     - name: Checkout
@@ -51,7 +71,7 @@ jobs:
         echo "::group::Clang"
         wget https://apt.llvm.org/llvm.sh
         chmod u+x llvm.sh
-        sudo ./llvm.sh 16
+        sudo ./llvm.sh ${{ matrix.version }}
         echo "::endgroup::"
         
         echo "::group::libdispatch"
@@ -67,7 +87,7 @@ jobs:
       shell: bash
       run: |
         cd test
-        CLANG=clang++-16 make
+        CLANG=clang++-${{ matrix.version }} make
 
     - name: Run tests
       shell: bash

CHANGELOG.md

@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+### Added
+- The library has been back-ported to work with Xcode 13 and 14. Previously Xcode 15 or higher was required.
+  Note that some functionality may be not present or limited on these older versions.
+
+### Fixed
+- Formatting `NSString *` via `std::format` and `fmt::format` now works again on latest Xcode/libc++ versions. 
+
 ## [3.1] - 2024-08-08
 
 ### Added

include/objc-helpers/BoxUtil.h

@@ -25,6 +25,7 @@
 #include <ostream>
 #include <sstream>
 #include <filesystem>
+#include <compare>
 
 
 /**
@@ -120,7 +121,7 @@ namespace BoxMakerDetail __attribute__((visibility("hidden"))) {
 template<class T>
 class __attribute__((visibility("hidden"))) BoxMaker {
 private:
-    static consteval auto detectBoxedType() {
+    static constexpr auto detectBoxedType() {
         if constexpr (std::totally_ordered<T>) {
             if constexpr (std::is_copy_constructible_v<T>) {
                 return (NSObject<BoxedValue, BoxedComparable, NSCopying> *)nullptr;
@@ -284,8 +285,13 @@ class __attribute__((visibility("hidden"))) BoxMaker {
             @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"comparison operand is of invalid type" userInfo:nullptr];
         auto * val = (T *)classData.addrOfValue(self);
         auto * otherVal = (T *)classData.addrOfValue(other);
+#if _LIBCPP_VERSION >= 14000
         const auto res = std::compare_strong_order_fallback(*val, *otherVal);
         return NSComparisonResult(-(res < 0) + (res > 0));
+#else
+        return NSComparisonResult(-(*val < *otherVal) + (*val > *otherVal));
+#endif
+        
     }
 public:
     template<class... Args>
@@ -334,7 +340,7 @@ class __attribute__((visibility("hidden"))) BoxMaker {
  */
 template<class T, class... Args>
 requires(std::is_constructible_v<T, Args...>)
-inline auto box(Args &&... args) -> BoxMaker<T>::BoxedType
+inline auto box(Args &&... args) -> typename BoxMaker<T>::BoxedType
     { return BoxMaker<T>::box(std::forward<Args>(args)...); }
 
 
@@ -358,7 +364,7 @@ inline auto box(Args &&... args) -> BoxMaker<T>::BoxedType
  */
 template<class T>
 requires(std::is_constructible_v<std::remove_cvref_t<T>, T &&>)
-inline auto box(T && src) -> BoxMaker<T>::BoxedType
+inline auto box(T && src) -> typename BoxMaker<T>::BoxedType
     { return BoxMaker<std::remove_cvref_t<T>>::box(std::forward<T>(src)); }
 
 /**

include/objc-helpers/CoDispatch.h

@@ -26,6 +26,7 @@
 #include <cassert>
 #include <limits>
 #include <utility>
+#include <exception>
 
 #include <dispatch/dispatch.h>
 #ifndef __OBJC__
@@ -316,7 +317,7 @@ inline namespace CO_DISPATCH_NS {
             }
 
             template<class X=ValueCarrier>
-            static auto moveOutValue(X::ValueToken token) noexcept(IsNoExceptExtractable) -> T
+            static auto moveOutValue(typename X::ValueToken token) noexcept(IsNoExceptExtractable) -> T
             requires(!ValueCarrier::isVoid && std::is_same_v<X, ValueCarrier>) {
                 Holder & holder = *token;
                 if constexpr (std::is_reference_v<T>)
@@ -658,7 +659,7 @@ inline namespace CO_DISPATCH_NS {
 
             template<class... Args>
             requires(DelayedValue::template IsEmplaceableFrom<Args...>)
-            void success(Args && ...args) const noexcept(noexcept(m_sharedState->emplaceReturnValue(std::forward<Args>(args)...))) 
+            void success(Args && ...args) const noexcept(noexcept(m_sharedState->emplaceReturnValue(std::forward<Args>(args)...)))
                 { m_sharedState->emplaceReturnValue(std::forward<Args>(args)...); }
 
             template<class X=DelayedValue>
@@ -958,7 +959,7 @@ inline namespace CO_DISPATCH_NS {
                 return awaiter{*this};
             }
 
-            void return_void() noexcept 
+            void return_void() noexcept
             {}
 
             void destroy() const noexcept {
@@ -1026,15 +1027,15 @@ inline namespace CO_DISPATCH_NS {
                 return m_valueToken;
             }
         private:
-            Iterator(Util::ClientAbandonPtr<Promise> && promise, dispatch_queue_t _Nullable queue, DelayedValue::ValueToken valueToken):
+            Iterator(Util::ClientAbandonPtr<Promise> && promise, dispatch_queue_t _Nullable queue, typename DelayedValue::ValueToken valueToken):
                 m_promise(std::move(promise)),
                 m_queue(queue),
                 m_valueToken(valueToken)
             {}
         private:
             Util::ClientAbandonPtr<Promise> m_promise;
             Util::QueueHolder m_queue;
-            DelayedValue::ValueToken m_valueToken;
+            typename DelayedValue::ValueToken m_valueToken;
         };
 
         auto beginOn(dispatch_queue_t _Nullable queue) && noexcept {
@@ -1141,7 +1142,7 @@ inline namespace CO_DISPATCH_NS {
     };
 
     /**
-     @function 
+     @function
      Coroutine version of `dispatch_io_read`
      
      Unlike `dispatch_io_read` the progressHandler parameter is optional and is only needed if you
@@ -1160,7 +1161,7 @@ inline namespace CO_DISPATCH_NS {
     }
 
     /**
-     @function 
+     @function
      Coroutine version of `dispatch_read`
      
      @return DispatchIOResult object with operation result
@@ -1174,7 +1175,7 @@ inline namespace CO_DISPATCH_NS {
     }
 
     /**
-     @function 
+     @function
      Coroutine version of `dispatch_io_write`
      
      Unlike `dispatch_io_write` the progressHandler parameter is optional and is only needed if you
@@ -1194,7 +1195,7 @@ inline namespace CO_DISPATCH_NS {
     }
 
     /**
-     @function 
+     @function
      Coroutine version of `dispatch_write`
      
      @return DispatchIOResult object with operation result