Support swift 5.9 with minimum 5.5 compatibility.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "OpenTimelineIO"]
 	path = OpenTimelineIO
-	url = https://github.com/PixarAnimationStudios/OpenTimelineIO.git
+	url = https://github.com/wabiverse/OTIOInterop.git

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -8,69 +8,99 @@ import PackageDescription
 
 let package = Package(
     name: "OpenTimelineIO",
-    platforms: [.macOS(.v10_13),
-        .iOS(.v11)],
+    platforms: [
+      .macOS(.v14),
+      .visionOS(.v1),
+      .iOS(.v17),
+      .tvOS(.v17),
+      .watchOS(.v10),
+    ],
     products: [
+        .library(name: "Imath", targets: ["ImathConfig", "Imath"]),
+        .library(name: "rapidjson", targets: ["rapidjson"]),
         .library(name: "OpenTime_CXX", targets: ["OpenTime_CXX"]),
         .library(name: "OpenTimelineIO_CXX", targets: ["OpenTimelineIO_CXX"]),
         .library(name: "OpenTimelineIO", targets: ["OpenTimelineIO"])
     ],
 
     dependencies: [],
     targets: [
-        .target(name: "otio_header_root",
-            path: ".",
+        .target(name: "ImathConfig"),
+
+        .target(name: "Imath",
+            dependencies: ["ImathConfig"],
+            path: "OpenTimelineIO/src/deps/Imath/src/Imath",
+            exclude: ["toFloat.cpp"],
+            publicHeadersPath: ".",
+            cxxSettings: [
+              .headerSearchPath("../.")
+            ]),
+
+        .target(name: "rapidjson",
+            path: "OpenTimelineIO/src/deps/rapidjson",
             exclude: [
-                "CONTRIBUTORS.md", "NOTICE.txt", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md",
-                "OTIO_CLA_Corporate.pdf", "OTIO_CLA_Individual.pdf",
-                "README.md", "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
-            sources: ["Sources/shims/otio_header_root-shim.cpp"],
-            publicHeadersPath:"OpenTimelineIO/src"),
+                "bin", "CMakeModules", "contrib", "doc",
+                "docker", "example", "test", "thirdparty"
+            ]),
 
         .target(name: "OpenTime_CXX",
-            dependencies: ["otio_header_root"],
-            path: "OpenTimelineIO/src/opentime",
-            exclude: ["CMakeLists.txt", "OpenTimeConfig.cmake.in"],
-            sources: ["."],
-            publicHeadersPath: ".",
-            cxxSettings: [ .headerSearchPath(".")]),
+            dependencies: ["Imath"],
+            path: "OpenTimelineIO/src",
+            exclude: ["deps", "opentimelineio", "opentimelineview", "py-opentimelineio"],
+            publicHeadersPath: "."),
 
         .target(name: "OpenTimelineIO_CXX",
-            dependencies: ["OpenTime_CXX"],
-            path: "OpenTimelineIO/src/opentimelineio",
-            exclude: ["CMakeLists.txt", "CORE_VERSION_MAP.last.cpp", "OpenTimelineIOConfig.cmake.in"],
-            sources: ["."],
-            publicHeadersPath: ".",
-            cxxSettings: [
-                .headerSearchPath("."),
-                .headerSearchPath("../deps/any/"),
-                .headerSearchPath("../deps/Imath/src/Imath"),
-                .headerSearchPath("../../../Sources/cpp"),
-                .headerSearchPath("../deps/rapidjson/include")]),
+            dependencies: ["Imath", "rapidjson", "OpenTime_CXX"],
+            path: "OpenTimelineIO/src",
+            exclude: ["deps", "opentime", "opentimelineview", "py-opentimelineio", "opentimelineio/CORE_VERSION_MAP.last.cpp"],
+            publicHeadersPath: "."),
+
+        // .target(name: "OpenTimelineIO_objc",
+        //     dependencies: ["OpenTimelineIO_CXX"],
+        //     path: "Sources",
+        //     exclude: ["swift", "shims", "interop", "ImathConfig"],
+        //     sources: ["objc"],
+        //     publicHeadersPath: "objc/include",
+        //     cxxSettings: [
+        //         .headerSearchPath("../OpenTimelineIO/src/deps/Imath/src/Imath"),
+        //         .headerSearchPath("objc/include")]),
 
-        .target(name: "OpenTimelineIO_objc",
+        .target(name: "OpenTimelineIO_cpp",
             dependencies: ["OpenTimelineIO_CXX"],
-            path: "Sources",
-            exclude: ["swift", "shims"],
-            sources: ["objc"],
-            publicHeadersPath: "objc/include",
-            cxxSettings: [
-                .headerSearchPath("../OpenTimelineIO/src/deps/Imath/src/Imath"),
-                .headerSearchPath("../Sources/cpp"),
-                .headerSearchPath("objc/include")]),
+            path: "Sources/cpp"),
 
-        // public target
+        // public swift/c++ target
         .target(name: "OpenTimelineIO",
-            dependencies: ["OpenTimelineIO_objc"],
-            path: "Sources",
-            exclude: ["objc", "shims"],
-            sources: ["swift"]),
+            dependencies: ["OpenTimelineIO_cpp"],
+            path: "Sources/interop",
+            swiftSettings: [
+                .interoperabilityMode(.Cxx)]),
+
+        // public swift/objc target
+        // .target(name: "OpenTimelineIO_OLD",
+        //     dependencies: ["OpenTimelineIO_objc"],
+        //     path: "Sources",
+        //     exclude: ["objc", "shims", "interop", "ImathConfig"],
+        //     sources: ["swift"]),
+
+        // .testTarget(name: "OpenTimelineIOTests",
+        //     dependencies: ["OpenTimelineIO"],
+        //     path: "Tests",
+        //     sources: ["OpenTimelineIOTests"],
+        //     resources: [ .copy("data") ],
+        //     swiftSettings: [
+        //       .interoperabilityMode(.Cxx)
+        //     ])
 
-        .testTarget(name: "OpenTimelineIOTests",
+        .testTarget(name: "OpenTimelineIOInteropTests",
             dependencies: ["OpenTimelineIO"],
             path: "Tests",
-            sources: ["OpenTimelineIOTests"],
-            resources: [ .copy("data") ])
+            exclude: ["OpenTimelineIOTests"],
+            sources: ["OpenTimelineIOInteropTests"],
+            resources: [ .copy("data") ],
+            swiftSettings: [
+              .interoperabilityMode(.Cxx)
+            ])
     ],
-    cxxLanguageStandard: CXXLanguageStandard.cxx17
+    cxxLanguageStandard: .cxx17
 )

Package@swift-5.5.swift

@@ -0,0 +1,76 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
+import PackageDescription
+
+let package = Package(
+    name: "OpenTimelineIO",
+    platforms: [.macOS(.v10_13),
+        .iOS(.v11)],
+    products: [
+        .library(name: "OpenTime_CXX", targets: ["OpenTime_CXX"]),
+        .library(name: "OpenTimelineIO_CXX", targets: ["OpenTimelineIO_CXX"]),
+        .library(name: "OpenTimelineIO", targets: ["OpenTimelineIO"])
+    ],
+
+    dependencies: [],
+    targets: [
+        .target(name: "otio_header_root",
+            path: ".",
+            exclude: [
+                "CONTRIBUTORS.md", "NOTICE.txt", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md",
+                "OTIO_CLA_Corporate.pdf", "OTIO_CLA_Individual.pdf",
+                "README.md", "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
+            sources: ["Sources/shims/otio_header_root-shim.cpp"],
+            publicHeadersPath:"OpenTimelineIO/src"),
+
+        .target(name: "OpenTime_CXX",
+            dependencies: ["otio_header_root"],
+            path: "OpenTimelineIO/src/opentime",
+            exclude: ["CMakeLists.txt", "OpenTimeConfig.cmake.in"],
+            sources: ["."],
+            publicHeadersPath: ".",
+            cxxSettings: [ .headerSearchPath(".")]),
+
+        .target(name: "OpenTimelineIO_CXX",
+            dependencies: ["OpenTime_CXX"],
+            path: "OpenTimelineIO/src/opentimelineio",
+            exclude: ["CMakeLists.txt", "CORE_VERSION_MAP.last.cpp", "OpenTimelineIOConfig.cmake.in"],
+            sources: ["."],
+            publicHeadersPath: ".",
+            cxxSettings: [
+                .headerSearchPath("."),
+                .headerSearchPath("../deps/any/"),
+                .headerSearchPath("../deps/Imath/src/Imath"),
+                .headerSearchPath("../../../Sources/cpp"),
+                .headerSearchPath("../deps/rapidjson/include")]),
+
+        .target(name: "OpenTimelineIO_objc",
+            dependencies: ["OpenTimelineIO_CXX"],
+            path: "Sources",
+            exclude: ["swift", "shims"],
+            sources: ["objc"],
+            publicHeadersPath: "objc/include",
+            cxxSettings: [
+                .headerSearchPath("../OpenTimelineIO/src/deps/Imath/src/Imath"),
+                .headerSearchPath("../Sources/cpp"),
+                .headerSearchPath("objc/include")]),
+
+        // public target
+        .target(name: "OpenTimelineIO",
+            dependencies: ["OpenTimelineIO_objc"],
+            path: "Sources",
+            exclude: ["objc", "shims"],
+            sources: ["swift"]),
+
+        .testTarget(name: "OpenTimelineIOTests",
+            dependencies: ["OpenTimelineIO"],
+            path: "Tests",
+            sources: ["OpenTimelineIOTests"],
+            resources: [ .copy("data") ])
+    ],
+    cxxLanguageStandard: .cxx17
+)

Sources/ImathConfig/ImathConfig.cpp

@@ -0,0 +1,3 @@
+#include <ImathConfig.h>
+
+int imath_config_header_version = 1;

Sources/cpp/include/opentimelineio.h

@@ -0,0 +1,59 @@
+//
+//  opentimelineio.h
+//
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the OpenTimelineIO project
+
+#include <opentimelineio/clip.h>
+#include <opentimelineio/composable.h>
+#include <opentimelineio/composition.h>
+#include <opentimelineio/effect.h>
+#include <opentimelineio/externalReference.h>
+#include <opentimelineio/freezeFrame.h>
+#include <opentimelineio/gap.h>
+#include <opentimelineio/generatorReference.h>
+#include <opentimelineio/item.h>
+#include <opentimelineio/linearTimeWarp.h>
+#include <opentimelineio/marker.h>
+#include <opentimelineio/mediaReference.h>
+#include <opentimelineio/missingReference.h>
+#include <opentimelineio/serializableCollection.h>
+#include <opentimelineio/serializableObject.h>
+#include <opentimelineio/serializableObjectWithMetadata.h>
+#include <opentimelineio/stack.h>
+#include <opentimelineio/timeEffect.h>
+#include <opentimelineio/timeline.h>
+#include <opentimelineio/track.h>
+#include <opentimelineio/transition.h>
+#include <opentimelineio/stack.h>
+#include <opentimelineio/stringUtils.h>
+#include <opentimelineio/unknownSchema.h>
+#include <opentimelineio/stringUtils.h>
+#include <opentimelineio/trackAlgorithm.h>
+#include <opentimelineio/stackAlgorithm.h>
+
+namespace otio {
+  using namespace opentimelineio::OPENTIMELINEIO_VERSION;
+
+  Clip* otio_new_clip();
+  Composable* otio_new_composable();
+  Composition* otio_new_composition();
+  Effect* otio_new_effect();
+  ExternalReference* otio_new_external_reference();
+  FreezeFrame* otio_new_freeze_frame();
+  Gap* otio_new_gap();
+  GeneratorReference* otio_new_generator_reference();
+  Item* otio_new_item();
+  LinearTimeWarp* otio_new_linear_time_warp();
+  Marker* otio_new_marker();
+  MediaReference* otio_new_media_reference();
+  MissingReference* otio_new_missing_reference();
+  SerializableCollection* otio_new_serializable_collection();
+  SerializableObject* otio_new_serializable_object();
+  SerializableObjectWithMetadata* otio_new_serializable_object_with_metadata();
+  Stack* otio_new_stack();
+  TimeEffect* otio_new_time_effect();
+  Timeline* otio_new_timeline();
+  Track* otio_new_track();
+  Transition* otio_new_transition();
+}