Skip to content

Commit ae0f100

Browse files
JoeMattJoeMatt
committed
change to ios16 from 17
Signed-off-by: Joseph Mattiello <[email protected]>
1 parent 741ced4 commit ae0f100

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+125
-116
lines changed

‎Cores/4DO

Submodule 4DO updated 1 file

‎Cores/Atari800/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "PVCoreAtari800",
88
platforms: [
9-
.iOS(.v17),
9+
.iOS(.v16),
1010
.tvOS(.v16),
1111
.watchOS(.v9),
1212
.macOS(.v11),

‎Cores/Bliss

Submodule Bliss updated 1 file

‎Cores/CrabEMU

‎Cores/Gambatte/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "PVCoreGambatte",
88
platforms: [
9-
.iOS(.v17),
9+
.iOS(.v16),
1010
.tvOS(.v16),
1111
.watchOS(.v9),
1212
.macOS(.v11),

‎Cores/Mednafen/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func mednafenTarget(name: String, dependencies: [String] = [], path: String, sou
119119
let package = Package(
120120
name: "PVCoreMednafen",
121121
platforms: [
122-
.iOS(.v17),
122+
.iOS(.v16),
123123
.tvOS(.v16),
124124
.watchOS(.v9),
125125
.macOS(.v11),

‎Cores/PicoDrive/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "PVCorePicoDrive",
88
platforms: [
9-
.iOS(.v17),
9+
.iOS(.v16),
1010
.tvOS(.v16),
1111
.watchOS(.v9),
1212
.macOS(.v11),

‎Cores/PokeMini/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let VIDEO_UPSCALE = "1"
1414
let package = Package(
1515
name: "PVCorePokeMini",
1616
platforms: [
17-
.iOS(.v17),
17+
.iOS(.v16),
1818
.tvOS(.v16),
1919
.watchOS(.v9),
2020
.macOS(.v11),

‎Cores/Stella/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "PVCoreStella",
88
platforms: [
9-
.iOS(.v17),
9+
.iOS(.v16),
1010
.tvOS(.v16),
1111
.watchOS(.v9),
1212
.macOS(.v11),

‎Cores/TGBDual/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "PVCoreTGBDual",
88
platforms: [
9-
.iOS(.v17),
9+
.iOS(.v16),
1010
.tvOS(.v16),
1111
.watchOS(.v9),
1212
.macOS(.v11),

‎Cores/VirtualJaguar

‎Cores/mGBA/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let libmGBACSettings: [PackageDescription.CSetting] = [
3333
let package = Package(
3434
name: "PVCoremGBA",
3535
platforms: [
36-
.iOS(.v17),
36+
.iOS(.v16),
3737
.tvOS(.v16),
3838
.watchOS(.v9),
3939
.macOS(.v10_13),

‎MoltenVK/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "MoltenVK",
77
platforms: [
8-
.iOS(.v17),
8+
.iOS(.v16),
99
.tvOS(.v16),
1010
.watchOS(.v9),
1111
.macOS(.v11),

‎PVJIT/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "PVJIT",
77
platforms: [
8-
.iOS(.v17),
8+
.iOS(.v16),
99
.tvOS(.v16),
1010
.visionOS(.v1)
1111
],

‎PVLibrary/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let linkerSettings: [LinkerSetting] = [
2323
let package = Package(
2424
name: "PVLibrary",
2525
platforms: [
26-
.iOS(.v17),
26+
.iOS(.v16),
2727
.tvOS(.v16),
2828
.watchOS(.v9),
2929
.macOS(.v14),

‎PVLibrary/Sources/PVLibrary/DirectoryWatcher/BIOSDirectoryWatcher.swift

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@ import PVLogging
1313
import Perception
1414
import PVFileSystem
1515

16-
#if !os(tvOS)
17-
@Observable
18-
#else
1916
@Perceptible
20-
#endif
2117
public final class BIOSWatcher: ObservableObject {
2218
public static let shared = BIOSWatcher()
2319

2420
private let biosPath: URL
2521
private var directoryWatcher: DirectoryWatcher?
2622

27-
@ObservationIgnored
23+
//@ObservationIgnored
2824
private var newBIOSFilesContinuation: AsyncStream<[URL]>.Continuation?
2925

3026
public var newBIOSFilesSequence: AsyncStream<[URL]> {

‎PVLibrary/Sources/PVLibrary/DirectoryWatcher/ConflictsWatcher.swift

-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ import Combine
44
import PVLogging
55
import Perception
66

7-
#if !os(tvOS)
8-
@Observable
9-
#else
107
@Perceptible
11-
#endif
128
public final class ConflictsWatcher: ObservableObject {
139
public static let shared = ConflictsWatcher()
1410

‎PVLibrary/Sources/PVLibrary/DirectoryWatcher/DirectoryWatcher.swift

+6-10
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ import Perception
6464
///
6565
/// The DirectoryWatcher monitors a specified directory for new files and changes,
6666
/// handling archive extraction and file processing automatically.
67-
#if !os(tvOS)
68-
@Observable
69-
#else
7067
@Perceptible
71-
#endif
7268
public final class DirectoryWatcher: ObservableObject {
7369

7470
private let watcherManager: FileWatcherManager
@@ -94,7 +90,7 @@ public final class DirectoryWatcher: ObservableObject {
9490
/// The current extraction status
9591
public var extractionStatus: ExtractionStatus = .idle
9692
// #if !os(tvOS)
97-
@ObservationIgnored
93+
// @ObservationIgnored
9894
// #endif
9995
private var statusContinuation: AsyncStream<ExtractionStatus>.Continuation?
10096

@@ -108,12 +104,12 @@ public final class DirectoryWatcher: ObservableObject {
108104
}
109105
}
110106

111-
#if os(tvOS)
107+
// #if os(tvOS)
108+
// private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
109+
// #else
110+
// @ObservationIgnored
112111
private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
113-
#else
114-
@ObservationIgnored
115-
private var completedFilesContinuation: AsyncStream<[URL]>.Continuation?
116-
#endif
112+
// #endif
117113

118114
/// A sequence of completed files
119115
public var completedFilesSequence: AsyncStream<[URL]> {

‎PVLibrary/Sources/PVLibrary/Importer/Models/ImportQueueItem.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import SwiftUI
99
import PVPrimitives
10+
import Perception
1011

1112
// Enum to define the possible statuses of each import
1213
public enum ImportStatus: String {
@@ -52,7 +53,7 @@ public enum ProcessingState {
5253
}
5354

5455
// ImportItem model to hold each file's metadata and progress
55-
@Observable
56+
@Perceptible
5657
public class ImportQueueItem: Identifiable, ObservableObject {
5758
public let id = UUID()
5859
public var url: URL

‎PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporter.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ public protocol GameImporting {
122122
}
123123

124124

125-
#if !os(tvOS)
126-
@Observable
127-
#else
125+
//#if !os(tvOS)
126+
//@Observable
127+
//#else
128128
@Perceptible
129-
#endif
129+
//#endif
130130
public final class GameImporter: GameImporting, ObservableObject {
131131
/// Closure called when import starts
132132
public var importStartedHandler: GameImporterImportStartedHandler?

‎PVLibrary/Sources/PVLibrary/SwiftData/BIOS_Data.swift

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
import SwiftData
1010
import PVPrimitives
1111

12-
#if !os(tvOS)
13-
@Model
14-
#endif
12+
//#if !os(tvOS)
13+
//@Model
14+
//#endif
1515
public class BIOS_Data {
1616
// Attributes
17-
#if !os(tvOS)
18-
@Attribute(.unique)
19-
#endif
17+
//#if !os(tvOS)
18+
// @Attribute(.unique)
19+
//#endif
2020
public var expectedFilename: String = ""
21-
#if !os(tvOS)
22-
@Attribute(.unique)
23-
#endif
21+
//#if !os(tvOS)
22+
// @Attribute(.unique)
23+
//#endif
2424
public var expectedMD5: String = ""
2525
public var expectedSize: Int = 0
2626
public var optional: Bool = false

‎PVLibrary/Sources/PVLibrary/SwiftData/Cheats_Data.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
@Model
11+
//@Model
1212
public class Cheats_Data {
13-
@Attribute(.unique)
13+
// @Attribute(.unique)
1414
public var id = UUID().uuidString
1515

1616
// Data

‎PVLibrary/Sources/PVLibrary/SwiftData/Core_Data.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import SwiftData
1010
import PVLogging
1111

12-
@Model
12+
//@Model
1313
public class Core_Data {
14-
@Attribute(.unique)
14+
// @Attribute(.unique)
1515
public var identifier: String = ""
1616

1717
public var principleClass: String = ""

‎PVLibrary/Sources/PVLibrary/SwiftData/File_Data.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
@Model
11+
//@Model
1212
public class File_Data {
1313
// Data
1414
internal var partialPath: String = ""

‎PVLibrary/Sources/PVLibrary/SwiftData/Game_Data.swift

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
@Model
11+
//@Model
1212
public class RecentGame_Data {
1313
public var game: Game_Data
1414
public var lastPlayedDate: Date = Date()
@@ -22,12 +22,12 @@ public class RecentGame_Data {
2222
}
2323

2424

25-
@Model
25+
//@Model
2626
public class Game_Data {
27-
@Attribute(.spotlight)
27+
// @Attribute(.spotlight)
2828
public var title: String = ""
2929

30-
@Attribute(.unique)
30+
// @Attribute(.unique)
3131
public var id :String = NSUUID().uuidString
3232

3333
// TODO: This is a 'partial path' meaing it's something like {system id}.filename
@@ -54,9 +54,9 @@ public class Game_Data {
5454
public var systemIdentifier: String = ""
5555
public var system: System_Data!
5656

57-
@Attribute(.unique)
57+
// @Attribute(.unique)
5858
public var md5Hash: String = ""
59-
@Attribute(.unique)
59+
// @Attribute(.unique)
6060
public var crc: String = ""
6161

6262
// If the user has set 'always use' for a specfic core
@@ -87,15 +87,15 @@ public class Game_Data {
8787
}
8888

8989
/* Extra metadata from OpenBG */
90-
@Attribute(.spotlight)
90+
// @Attribute(.spotlight)
9191
public var gameDescription: String?
9292
public var boxBackArtworkURL: String?
93-
@Attribute(.spotlight)
93+
// @Attribute(.spotlight)
9494
public var developer: String?
95-
@Attribute(.spotlight)
95+
// @Attribute(.spotlight)
9696
public var publisher: String?
9797
public var publishDate: String?
98-
@Attribute(.spotlight)
98+
// @Attribute(.spotlight)
9999
public var genres: String? // Is a comma seperated list or single entry
100100
public var referenceURL: String?
101101
public var releaseID: String?

‎PVLibrary/Sources/PVLibrary/SwiftData/ImageFile_Data.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import CoreGraphics
1212
import SwiftUI
1313

1414
#warning("Make subclass of File_Data")
15-
@Model
15+
//@Model
1616
public class ImageFile_Data {// : File_Data {
1717

1818
internal var partialPath: String = ""

‎PVLibrary/Sources/PVLibrary/SwiftData/Library_Data.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
@Model
11+
//@Model
1212
public class Library_Data {
1313

1414
// Data
15-
@Attribute(.unique)
15+
// @Attribute(.unique)
1616
public var uuid: String = ""
1717
public var name: String = ""
1818

‎PVLibrary/Sources/PVLibrary/SwiftData/SaveState_Data.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
@Model
11+
//@Model
1212
public class SaveState_Data {
1313

1414
// Data
15-
@Attribute(.unique)
15+
// @Attribute(.unique)
1616
public var id: String = UUID().uuidString
1717

1818
public var date: Date = Date()

‎PVLibrary/Sources/PVLibrary/SwiftData/System_Data.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Systems
2020
import TVServices
2121
#endif
2222

23-
@Model
23+
//@Model
2424
public class System_Data {
2525
public typealias BIOSInfoProviderType = BIOS_Data
2626

‎PVLibrary/Sources/PVLibrary/SwiftData/User_Data.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
#if canImport(SwiftData) && !os(tvOS)
99
import SwiftData
1010

11-
#if !os(tvOS)
12-
@Model
13-
#endif
11+
//#if !os(tvOS)
12+
//@Model
13+
//#endif
1414
public class User_Data {
1515
// Data
16-
#if !os(tvOS)
17-
@Attribute(.unique)
18-
#endif
16+
//#if !os(tvOS)
17+
// @Attribute(.unique)
18+
//#endif
1919
public var uuid: String = UUID().uuidString
2020

2121
public var name: String = ""

0 commit comments

Comments
 (0)