Cleaned up the code that splits and reconstructs files.

It had a bunch of silent failures. Now we fail better.

Changed the ordered(fromUnordered…) in MergeableArray again.

It now visits items in the same order as the original recursive approach, and all tests pass as a result.

Removed recursion from ordered(fromUnordered…).

Seemed to blow up on mac and crash with too much data.

Added some cycle detection in MergeableArray.

It shouldn’t happen, but I did see crash. I suspect it was due to corruption.

A few subtle fixes in MergeableArray to do with optional keys.

Removed the dependency of ForkedModelMacros on other modules (eg Fork…

…edMerge).

This caused SPM to fail in Xcode release builds with multiple archs (eg macOS). It was working with xcodebuild, so seems it is probably a bug in Xcode itself, but this change simplifies the dependencies.

The error itself was that there were two rules to create the library Forked.o and ForkedMerge.o. This was because they were both used in the macros.

To fix this, we no longer have a dependence on them in the macros. To achieve this, we have duplicated the enums. Apparently this is acceptable, because the macros are used in a different context, and just produce code.

Removed unneeded import of ForkedMerge.

Removed @_exported

Was causing problems with archiving due to duplicate .o files.

Upped the version dependency of macCatalyst to v14.

Seems it is needed for the macro stuff.

Merge branch 'main' of github.com:drewmccormack/Forked