Purge any and optionalite targets, shims and references, and code.

OpenTimelineIO · Sep 25, 2024 · bc8760a · bc8760a
1 parent 91fadb1
commit bc8760a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 38 deletions.
diff --git a/Package.swift b/Package.swift
@@ -11,41 +11,19 @@ let package = Package(
     platforms: [.macOS(.v10_13),
         .iOS(.v11)],
     products: [
-        .library(name: "any", targets: ["any"]),
         .library(name: "OpenTime_CXX", targets: ["OpenTime_CXX"]),
         .library(name: "OpenTimelineIO_CXX", targets: ["OpenTimelineIO_CXX"]),
         .library(name: "OpenTimelineIO", targets: ["OpenTimelineIO"])
     ],
 
     dependencies: [],
     targets: [
-        .target(name: "any",
-            path: ".",
-            exclude: [
-                "CONTRIBUTORS.md", "NOTICE.txt", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md",
-                "OTIO_CLA_Corporate.pdf", "OTIO_CLA_Individual.pdf",
-                "README.md", "Sources/shims/optionallite-shim.cpp", "Sources/shims/otio_header_root-shim.cpp",
-                "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
-            sources: ["Sources/shims/any-shim.cpp"],
-            publicHeadersPath:"OpenTimelineIO/src/deps"),
-
-        .target(name: "optionallite",
-            path: ".",
-            exclude: [
-                "CONTRIBUTORS.md", "NOTICE.txt", "CONTRIBUTING.md", "LICENSE.txt", "CODE_OF_CONDUCT.md",
-                "OTIO_CLA_Corporate.pdf", "OTIO_CLA_Individual.pdf",
-                "README.md", "Sources/shims/any-shim.cpp", "Sources/shims/otio_header_root-shim.cpp",
-                "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
-            sources: ["Sources/shims/optionallite-shim.cpp"],
-            publicHeadersPath:"OpenTimelineIO/src/deps/optional-lite/include"),
-
         .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", "Sources/shims/any-shim.cpp", "Sources/shims/optionallite-shim.cpp",
-                "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
+                "README.md", "Examples", "OpenTimelineIO", "Tests", "Sources/objc", "Sources/swift"],
             sources: ["Sources/shims/otio_header_root-shim.cpp"],
             publicHeadersPath:"OpenTimelineIO/src"),
 
@@ -58,7 +36,7 @@ let package = Package(
             cxxSettings: [ .headerSearchPath(".")]),
 
         .target(name: "OpenTimelineIO_CXX",
-            dependencies: ["OpenTime_CXX", "any", "optionallite"],
+            dependencies: ["OpenTime_CXX"],
             path: "OpenTimelineIO/src/opentimelineio",
             exclude: ["CMakeLists.txt", "CORE_VERSION_MAP.last.cpp", "OpenTimelineIOConfig.cmake.in"],
             sources: ["."],

diff --git a/Sources/shims/any-shim.cpp b/Sources/shims/any-shim.cpp
diff --git a/Sources/shims/optionallite-shim.cpp b/Sources/shims/optionallite-shim.cpp