change to ios16 from 17

Signed-off-by: Joseph Mattiello <git@joemattiello.com>
Provenance-Emu · Nov 15, 2024 · ae0f100 · ae0f100
1 parent 741ced4
commit ae0f100
Show file tree

Hide file tree

Showing 41 changed files with 125 additions and 116 deletions.
diff --git a/Cores/4DO b/Cores/4DO
diff --git a/Cores/Atari800/Package.swift b/Cores/Atari800/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PVCoreAtari800",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/Bliss b/Cores/Bliss
diff --git a/Cores/CrabEMU b/Cores/CrabEMU
diff --git a/Cores/Gambatte/Package.swift b/Cores/Gambatte/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PVCoreGambatte",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/Mednafen/Package.swift b/Cores/Mednafen/Package.swift
@@ -119,7 +119,7 @@ func mednafenTarget(name: String, dependencies: [String] = [], path: String, sou
 let package = Package(
     name: "PVCoreMednafen",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/PicoDrive/Package.swift b/Cores/PicoDrive/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PVCorePicoDrive",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/PokeMini/Package.swift b/Cores/PokeMini/Package.swift
@@ -14,7 +14,7 @@ let VIDEO_UPSCALE = "1"
 let package = Package(
     name: "PVCorePokeMini",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/Stella/Package.swift b/Cores/Stella/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PVCoreStella",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/TGBDual/Package.swift b/Cores/TGBDual/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "PVCoreTGBDual",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/Cores/VirtualJaguar b/Cores/VirtualJaguar
diff --git a/Cores/mGBA/Package.swift b/Cores/mGBA/Package.swift
@@ -33,7 +33,7 @@ let libmGBACSettings: [PackageDescription.CSetting] = [
 let package = Package(
     name: "PVCoremGBA",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v10_13),

diff --git a/MoltenVK/Package.swift b/MoltenVK/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "MoltenVK",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v11),

diff --git a/PVJIT/Package.swift b/PVJIT/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "PVJIT",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .visionOS(.v1)
     ],

diff --git a/PVLibrary/Package.swift b/PVLibrary/Package.swift
@@ -23,7 +23,7 @@ let linkerSettings: [LinkerSetting] = [
 let package = Package(
     name: "PVLibrary",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v16),
         .tvOS(.v16),
         .watchOS(.v9),
         .macOS(.v14),

diff --git a/PVLibrary/Sources/PVLibrary/DirectoryWatcher/BIOSDirectoryWatcher.swift b/PVLibrary/Sources/PVLibrary/DirectoryWatcher/BIOSDirectoryWatcher.swift
@@ -13,18 +13,14 @@ import PVLogging
 import Perception
 import PVFileSystem
 
-#if !os(tvOS)
-@Observable
-#else
 @Perceptible
-#endif
 public final class BIOSWatcher: ObservableObject {
     public static let shared = BIOSWatcher()
 
     private let biosPath: URL
     private var directoryWatcher: DirectoryWatcher?
 
-    @ObservationIgnored
+    //@ObservationIgnored
     private var newBIOSFilesContinuation: AsyncStream<[URL]>.Continuation?
 
     public var newBIOSFilesSequence: AsyncStream<[URL]> {

diff --git a/PVLibrary/Sources/PVLibrary/DirectoryWatcher/ConflictsWatcher.swift b/PVLibrary/Sources/PVLibrary/DirectoryWatcher/ConflictsWatcher.swift
@@ -4,11 +4,7 @@ import Combine
 import PVLogging
 import Perception
 
-#if !os(tvOS)
-@Observable
-#else
 @Perceptible
-#endif
 public final class ConflictsWatcher: ObservableObject {
     public static let shared = ConflictsWatcher()
 

diff --git a/PVLibrary/Sources/PVLibrary/DirectoryWatcher/DirectoryWatcher.swift b/PVLibrary/Sources/PVLibrary/DirectoryWatcher/DirectoryWatcher.swift
@@ -64,11 +64,7 @@ import Perception
 ///
 /// The DirectoryWatcher monitors a specified directory for new files and changes,
 /// handling archive extraction and file processing automatically.
-#if !os(tvOS)
-@Observable
-#else
 @Perceptible
-#endif
 public final class DirectoryWatcher: ObservableObject {
 
     private let watcherManager: FileWatcherManager
@@ -94,7 +90,7 @@ public final class DirectoryWatcher: ObservableObject {
     /// The current extraction status
     public var extractionStatus: ExtractionStatus = .idle
 //    #if !os(tvOS)
-    @ObservationIgnored
+//    @ObservationIgnored
 //    #endif
     private var statusContinuation: AsyncStream<ExtractionStatus>.Continuation?
 
@@ -108,12 +104,12 @@ public final class DirectoryWatcher: ObservableObject {
         }
     }
 
-    #if os(tvOS)
+//    #if os(tvOS)
+//    private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
+//    #else
+//    @ObservationIgnored
     private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
-    #else
-    @ObservationIgnored
-    private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
-    #endif
+//    #endif
 
     /// A sequence of completed files
     public var completedFilesSequence: AsyncStream<[URL]> {

diff --git a/PVLibrary/Sources/PVLibrary/Importer/Models/ImportQueueItem.swift b/PVLibrary/Sources/PVLibrary/Importer/Models/ImportQueueItem.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import PVPrimitives
+import Perception
 
 // Enum to define the possible statuses of each import
 public enum ImportStatus: String {
@@ -52,7 +53,7 @@ public enum ProcessingState {
 }
 
 // ImportItem model to hold each file's metadata and progress
-@Observable
+@Perceptible
 public class ImportQueueItem: Identifiable, ObservableObject {
     public let id = UUID()
     public var url: URL

diff --git a/PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporter.swift b/PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporter.swift
@@ -122,11 +122,11 @@ public protocol GameImporting {
 }
 
 
-#if !os(tvOS)
-@Observable
-#else
+//#if !os(tvOS)
+//@Observable
+//#else
 @Perceptible
-#endif
+//#endif
 public final class GameImporter: GameImporting, ObservableObject {
     /// Closure called when import starts
     public var importStartedHandler: GameImporterImportStartedHandler?

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/BIOS_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/BIOS_Data.swift
@@ -9,18 +9,18 @@
 import SwiftData
 import PVPrimitives
 
-#if !os(tvOS)
-@Model
-#endif
+//#if !os(tvOS)
+//@Model
+//#endif
 public class BIOS_Data {
     // Attributes
-#if !os(tvOS)
-    @Attribute(.unique)
-#endif
+//#if !os(tvOS)
+//    @Attribute(.unique)
+//#endif
     public var expectedFilename: String = ""
-#if !os(tvOS)
-    @Attribute(.unique)
-#endif
+//#if !os(tvOS)
+//    @Attribute(.unique)
+//#endif
     public var expectedMD5: String = ""
     public var expectedSize: Int = 0
     public var optional: Bool = false

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/Cheats_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/Cheats_Data.swift
@@ -8,9 +8,9 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-@Model
+//@Model
 public class Cheats_Data {
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var id = UUID().uuidString
 
     // Data

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/Core_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/Core_Data.swift
@@ -9,9 +9,9 @@
 import SwiftData
 import PVLogging
 
-@Model
+//@Model
 public class Core_Data {
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var identifier: String = ""
 
     public var principleClass: String = ""

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/File_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/File_Data.swift
@@ -8,7 +8,7 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-@Model
+//@Model
 public class File_Data {
     // Data
     internal var partialPath: String = ""

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/Game_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/Game_Data.swift
@@ -8,7 +8,7 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-@Model
+//@Model
 public class RecentGame_Data {
     public var game: Game_Data
     public var lastPlayedDate: Date = Date()
@@ -22,12 +22,12 @@ public class RecentGame_Data {
 }
 
 
-@Model
+//@Model
 public class Game_Data {
-    @Attribute(.spotlight)
+//    @Attribute(.spotlight)
     public var title: String = ""
 
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var id :String = NSUUID().uuidString
 
     // TODO: This is a 'partial path' meaing it's something like {system id}.filename
@@ -54,9 +54,9 @@ public class Game_Data {
     public var systemIdentifier: String = ""
     public var system: System_Data!
 
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var md5Hash: String = ""
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var crc: String = ""
 
     // If the user has set 'always use' for a specfic core
@@ -87,15 +87,15 @@ public class Game_Data {
     }
 
     /* Extra metadata from OpenBG */
-    @Attribute(.spotlight)
+//    @Attribute(.spotlight)
     public var gameDescription: String?
     public var boxBackArtworkURL: String?
-    @Attribute(.spotlight)
+//    @Attribute(.spotlight)
     public var developer: String?
-    @Attribute(.spotlight)
+//    @Attribute(.spotlight)
     public var publisher: String?
     public var publishDate: String?
-    @Attribute(.spotlight)
+//    @Attribute(.spotlight)
     public var genres: String? // Is a comma seperated list or single entry
     public var referenceURL: String?
     public var releaseID: String?

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/ImageFile_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/ImageFile_Data.swift
@@ -12,7 +12,7 @@ import CoreGraphics
 import SwiftUI
 
 #warning("Make subclass of File_Data")
-@Model
+//@Model
 public class ImageFile_Data {// : File_Data {
 
     internal var partialPath: String = ""

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/Library_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/Library_Data.swift
@@ -8,11 +8,11 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-@Model
+//@Model
 public class Library_Data {
 
     // Data
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var uuid: String = ""
     public var name: String = ""
 

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/SaveState_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/SaveState_Data.swift
@@ -8,11 +8,11 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-@Model
+//@Model
 public class SaveState_Data {
 
     // Data
-    @Attribute(.unique)
+//    @Attribute(.unique)
     public var id: String = UUID().uuidString
 
     public var date: Date = Date()

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/System_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/System_Data.swift
@@ -20,7 +20,7 @@ import Systems
 import TVServices
 #endif
 
-@Model
+//@Model
 public class System_Data {
     public typealias BIOSInfoProviderType = BIOS_Data
 

diff --git a/PVLibrary/Sources/PVLibrary/SwiftData/User_Data.swift b/PVLibrary/Sources/PVLibrary/SwiftData/User_Data.swift
@@ -8,14 +8,14 @@
 #if canImport(SwiftData) && !os(tvOS)
 import SwiftData
 
-#if !os(tvOS)
-@Model
-#endif
+//#if !os(tvOS)
+//@Model
+//#endif
 public class User_Data {
     // Data
-#if !os(tvOS)
-    @Attribute(.unique)
-#endif
+//#if !os(tvOS)
+//    @Attribute(.unique)
+//#endif
     public var uuid: String = UUID().uuidString
 
     public var name: String = ""