Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 2 commits into from
Feb 25, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
462e8ef
Bump version to 6.5.1 and enable apple-generic versioning
Kyle-Ye Feb 25, 2026
e648790
Optimize OpenAttributeGraphCompatibilityTests
Kyle-Ye Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Configs/OpenAttributeGraph.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -470,6 +470,9 @@ if computeCondition {
setupDPFDependency()
openAttributeGraphCompatibilityTestsTarget.addAGSettings()
} else {
openAttributeGraphCompatibilityTestsTarget.dependencies.append(
.target(name: openAttributeGraphTarget.name)
)
package.targets += [
utilitiesTestsTarget,
openAttributeGraphCxxTestsTarget,
Expand Down
8 changes: 6 additions & 2 deletions Sources/OpenAttributeGraphCxx/Version/OAGVersion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Tests/OpenAttributeGraphCompatibilityTests/VersionCompatibilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down