Bump to Swift 6.1 toolchain (#129)

* Bump to Swift 6.1 toolchain

* Remove OG_COUNTED_BY usage

* Fix OG_COUNTED_BY issue on Linux and macOS

Author: Kyle-Ye

.github/workflows/compatibility_tests.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         include:
           - os: macos-15
-            xcode-version: "16.0"   # Swift 6.0
+            xcode-version: "16.3"   # Swift 6.1
     runs-on: ${{ matrix.os }}
     env:
       OPENGRAPH_WERROR: 1

.github/workflows/ios.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15]
-        xcode-version: ["16.0"]   # Swift 6.0
+        xcode-version: ["16.3"]   # Swift 6.1
         ios-version: ["18.0"]
         include:
           - ios-version: "18.0"

.github/workflows/macos.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15]
-        xcode-version: ["16.0"]   # Swift 6.0
+        xcode-version: ["16.3"]   # Swift 6.1
     runs-on: ${{ matrix.os }}
     env:
       OPENGRAPH_WERROR: 1

.github/workflows/ubuntu.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ["6.0"]
+        swift_version: ["6.1"]
     runs-on: ubuntu-22.04
     env:
       OPENGRAPH_WERROR: 1

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import Foundation

Package.swift

@@ -25,6 +25,10 @@ The project is for the following purposes:
 
 Currently, this project is in early development.
 
+## Build
+
+The current suggested toolchain to build the project is Swift 6.1 / Xcode 16.3.
+
 ## Credits
 
 OpenGraph_SPI's Data, Graph, Vector and more is modified based on [Compute](https://github.com/jcmosc/Compute)'s implementations.

README.md

@@ -43,15 +43,19 @@
 #define OG_CONSTEXPR
 #endif
 
+#if __has_include(<ptrcheck.h>) // Fix conflict define issue of the SDK
+#include <ptrcheck.h>
+#define OG_COUNTED_BY(N) __counted_by(N)
+#else
 #if !defined(__counted_by)
 #if __has_attribute(__counted_by__)
 #define __counted_by(N) __attribute__((__counted_by__(N)))
 #else
 #define __counted_by(N)
 #endif
 #endif
-
 #define OG_COUNTED_BY(N) __counted_by(N)
+#endif
 
 #include "OGSwiftSupport.h"
 #include "OGTargetConditionals.h"

Sources/OpenGraph_SPI/include/OGBase.h

@@ -103,9 +103,18 @@ OG_EXPORT
 OG_REFINED_FOR_SWIFT
 void OGGraphSetNeedsUpdate(OGGraphRef graph) OG_SWIFT_NAME(OGGraphRef.setNeedsUpdate(self:));
 
+#if OG_TARGET_OS_DARWIN
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
 bool OGGraphAnyInputsChanged(const OGAttribute *inputs OG_COUNTED_BY(count), size_t count);
+#else
+// __counted_by__ is supported with Swift 6.1+ toolchain's clang on Linux.
+// But it required the count to be declared first which is not required on Apple clang.
+// See https://github.com/OpenSwiftUIProject/OpenGraph/issues/130
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+bool OGGraphAnyInputsChanged(const OGAttribute *inputs, size_t count);
+#endif
 
 OG_EXTERN_C_END