Merge pull request #107 from TheAcharya/markersextractor-xcode-16-ref…

…actors Updates for MarkersExtractor 0.3.10 for Xcode 16/Swift 6 compatibility (#106)
TheAcharya · Sep 21, 2024 · c03b2ae · c03b2ae
2 parents e61456a + bd077b2
commit c03b2ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/Source/Marker Data/Marker Data.xcodeproj/project.pbxproj b/Source/Marker Data/Marker Data.xcodeproj/project.pbxproj
@@ -1685,7 +1685,7 @@
 			repositoryURL = "https://github.com/TheAcharya/MarkersExtractor";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.3.9;
+				minimumVersion = 0.3.10;
 			};
 		};
 		4155B72A2B668C0D008D3505 /* XCRemoteSwiftPackageReference "swift-log-oslog" */ = {

diff --git a/Source/Marker Data/Marker Data/Models/Settings/MarkersExtractorModelExtensions.swift b/Source/Marker Data/Marker Data/Models/Settings/MarkersExtractorModelExtensions.swift
@@ -8,7 +8,7 @@
 import Foundation
 import MarkersExtractor
 
-extension ExportFolderFormat: Codable, Identifiable {
+extension ExportFolderFormat: Codable {
     var displayName: String {
         switch self {
         case .short:
@@ -19,13 +19,9 @@ extension ExportFolderFormat: Codable, Identifiable {
             "Long"
         }
     }
-
-    public var id: String {
-        self.rawValue
-    }
 }
 
-extension MarkerIDMode: Codable, Identifiable {
+extension MarkerIDMode: Codable {
     var displayName: String {
         switch self {
         case .timelineNameAndTimecode:
@@ -36,13 +32,9 @@ extension MarkerIDMode: Codable, Identifiable {
             "Notes"
         }
     }
-
-    public var id: String {
-        self.rawValue
-    }
 }
 
-extension MarkerLabelProperties.AlignHorizontal: Codable, Identifiable {
+extension MarkerLabelProperties.AlignHorizontal: Codable {
     var displayName: String {
         switch self {
         case .left:
@@ -53,13 +45,9 @@ extension MarkerLabelProperties.AlignHorizontal: Codable, Identifiable {
             "Right"
         }
     }
-
-    public var id: String {
-        self.rawValue
-    }
 }
 
-extension MarkerLabelProperties.AlignVertical: Codable, Identifiable {
+extension MarkerLabelProperties.AlignVertical: Codable {
     var displayName: String {
         switch self {
         case .top:
@@ -70,16 +58,8 @@ extension MarkerLabelProperties.AlignVertical: Codable, Identifiable {
             "Bottom"
         }
     }
-
-    public var id: String {
-        self.rawValue
-    }
 }
 
-extension ExportField: Codable, Identifiable {
-    public var id: String {
-        self.rawValue
-    }
-}
+extension ExportField: Codable {}
 
 extension MarkersSource: Codable {}
diff --git a/Source/Marker Data/Marker Data/Utilities/Extensions/RoleExtension.swift b/Source/Marker Data/Marker Data/Utilities/Extensions/RoleExtension.swift
@@ -8,8 +8,4 @@
 import Foundation
 import DAWFileKit
 
-extension FinalCutPro.FCPXML.AnyRole: Identifiable, Codable {
-    public var id: String {
-        self.role
-    }
-}
+extension FinalCutPro.FCPXML.AnyRole: Codable {}