Bump version to 6.5.1 and enable apple-generic versioning (#216)

Author: Kyle-Ye

Configs/OpenAttributeGraph.xcconfig

@@ -34,11 +34,9 @@ SKIP_INSTALL = NO
 // MARK: - Framework
 
 GENERATE_INFOPLIST_FILE = YES
-CURRENT_PROJECT_VERSION = 1
+CURRENT_PROJECT_VERSION = 6.5.1
 MARKETING_VERSION = 1.0
-// OAGVersion.c defines OpenAttributeGraphVersionNumber/String manually,
-// so disable Xcode's auto-generated version object to avoid duplicate symbols.
-// VERSIONING_SYSTEM = apple-generic
+VERSIONING_SYSTEM = apple-generic
 DYLIB_COMPATIBILITY_VERSION = 1
 DYLIB_CURRENT_VERSION = 1
 DYLIB_INSTALL_NAME_BASE = @rpath

Package.resolved

@@ -212,7 +212,7 @@ if libraryEvolutionCondition {
     // Either set OPENATTRIBUTEGRAPH_LIBRARY_EVOLUTION=0 or add `-Xswiftc -no-verify-emitted-module-interface` after `swift build`
     sharedSwiftSettings.append(.unsafeFlags(["-enable-library-evolution", "-no-verify-emitted-module-interface"]))
 }
-if !compatibilityTestCondition {
+if !(compatibilityTestCondition && buildForDarwinPlatform) {
     sharedCSettings.append(.define("OPENATTRIBUTEGRAPH"))
     sharedCxxSettings.append(.define("OPENATTRIBUTEGRAPH"))
     sharedSwiftSettings.append(.define("OPENATTRIBUTEGRAPH"))
@@ -358,7 +358,7 @@ let openAttributeGraphCompatibilityTestsTarget = Target.testTarget(
     name: "OpenAttributeGraphCompatibilityTests",
     dependencies: [
         .product(name: "Numerics", package: "swift-numerics"),
-    ] + (compatibilityTestCondition ? [] : [.target(name: openAttributeGraphTarget.name)]),
+    ],
     exclude: ["README.md"],
     cSettings: sharedCSettings,
     cxxSettings: sharedCxxSettings,
@@ -470,6 +470,9 @@ if computeCondition {
         setupDPFDependency()
         openAttributeGraphCompatibilityTestsTarget.addAGSettings()
     } else {
+        openAttributeGraphCompatibilityTestsTarget.dependencies.append(
+            .target(name: openAttributeGraphTarget.name)
+        )
         package.targets += [
             utilitiesTestsTarget,
             openAttributeGraphCxxTestsTarget,

Package.swift

@@ -6,11 +6,15 @@
 #include <OpenAttributeGraph/OAGVersion.h>
 
 #if OPENATTRIBUTEGRAPH_RELEASE == OPENATTRIBUTEGRAPH_RELEASE_2024
-double OpenAttributeGraphVersionNumber __attribute__ ((used)) = (double)6.0;
-const unsigned char OpenAttributeGraphVersionString[] __attribute__ ((used)) = "@(#)PROAGRAM:OpenAttributeGraph  PROJECT:OpenAttributeGraph-6.0.87\n";
+#if SWIFT_PACKAGE
+double OpenAttributeGraphVersionNumber __attribute__ ((used)) = (double)6.5;
+const unsigned char OpenAttributeGraphVersionString[] __attribute__ ((used)) = "@(#)PROAGRAM:OpenAttributeGraph  PROJECT:OpenAttributeGraph-6.5.1\n";
+#endif
 const uint64_t OAGVersion = 0x2001e;
 #elif OPENATTRIBUTEGRAPH_RELEASE == OPENATTRIBUTEGRAPH_RELEASE_2021
+#if SWIFT_PACKAGE
 double OpenAttributeGraphVersionNumber __attribute__ ((used)) = (double)3.2;
 const unsigned char OpenAttributeGraphVersionString[] __attribute__ ((used)) = "@(#)PROAGRAM:OpenAttributeGraph  PROJECT:OpenAttributeGraph-3.2.1\n";
+#endif
 const uint64_t OAGVersion = 0x20014;
 #endif

Sources/OpenAttributeGraphCxx/Version/OAGVersion.c

@@ -16,7 +16,7 @@ struct VersionTests {
                 #expect(OAGVersion == 0x20014)
                 confirm()
             case OPENATTRIBUTEGRAPH_RELEASE_2024:
-                #expect(OpenAttributeGraphVersionNumber.isApproximatelyEqual(to: 6.0))
+                #expect(OpenAttributeGraphVersionNumber.isApproximatelyEqual(to: 6.5))
                 #expect(OAGVersion == 0x2001e)
                 confirm()
             default: