Skip to content

Commit

Permalink
change to ios16 from 17
Browse files Browse the repository at this point in the history
Signed-off-by: Joseph Mattiello <git@joemattiello.com>
  • Loading branch information
JoeMatt committed Nov 15, 2024
1 parent 741ced4 commit 0f613e9
Show file tree
Hide file tree
Showing 42 changed files with 129 additions and 123 deletions.
2 changes: 1 addition & 1 deletion Cores/4DO
Submodule 4DO updated 1 files
+1 −1 Package.swift
2 changes: 1 addition & 1 deletion Cores/Atari800/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "PVCoreAtari800",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/Bliss
Submodule Bliss updated 1 files
+1 −1 Package.swift
2 changes: 1 addition & 1 deletion Cores/CrabEMU
Submodule CrabEMU updated 1 files
+1 −1 Package.swift
2 changes: 1 addition & 1 deletion Cores/Gambatte/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "PVCoreGambatte",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/Mednafen/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion Cores/PicoDrive/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "PVCorePicoDrive",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/PokeMini/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let VIDEO_UPSCALE = "1"
let package = Package(
name: "PVCorePokeMini",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/Stella/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "PVCoreStella",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/TGBDual/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "PVCoreTGBDual",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion Cores/VirtualJaguar
Submodule VirtualJaguar updated 1 files
+1 −1 Package.swift
2 changes: 1 addition & 1 deletion Cores/mGBA/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion MoltenVK/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "MoltenVK",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v11),
Expand Down
2 changes: 1 addition & 1 deletion PVJIT/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "PVJIT",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.visionOS(.v1)
],
Expand Down
2 changes: 1 addition & 1 deletion PVLibrary/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let linkerSettings: [LinkerSetting] = [
let package = Package(
name: "PVLibrary",
platforms: [
.iOS(.v17),
.iOS(.v16),
.tvOS(.v16),
.watchOS(.v9),
.macOS(.v14),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?

Expand All @@ -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]> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import SwiftUI
import PVPrimitives
import Perception

// Enum to define the possible statuses of each import
public enum ImportStatus: String {
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
18 changes: 9 additions & 9 deletions PVLibrary/Sources/PVLibrary/SwiftData/BIOS_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions PVLibrary/Sources/PVLibrary/SwiftData/Cheats_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions PVLibrary/Sources/PVLibrary/SwiftData/Core_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 1 addition & 1 deletion PVLibrary/Sources/PVLibrary/SwiftData/File_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#if canImport(SwiftData) && !os(tvOS)
import SwiftData

@Model
//@Model
public class File_Data {
// Data
internal var partialPath: String = ""
Expand Down
20 changes: 10 additions & 10 deletions PVLibrary/Sources/PVLibrary/SwiftData/Game_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion PVLibrary/Sources/PVLibrary/SwiftData/ImageFile_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
4 changes: 2 additions & 2 deletions PVLibrary/Sources/PVLibrary/SwiftData/Library_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
4 changes: 2 additions & 2 deletions PVLibrary/Sources/PVLibrary/SwiftData/SaveState_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion PVLibrary/Sources/PVLibrary/SwiftData/System_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Systems
import TVServices
#endif

@Model
//@Model
public class System_Data {
public typealias BIOSInfoProviderType = BIOS_Data

Expand Down
12 changes: 6 additions & 6 deletions PVLibrary/Sources/PVLibrary/SwiftData/User_Data.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
Loading

0 comments on commit 0f613e9

Please sign in to comment.