diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8270bcf..c6dd4c34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - "Swiftfin" - "Swiftfin tvOS" - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout @@ -31,7 +31,7 @@ jobs: run: brew install swiftgen - name: Set Xcode Version - run: sudo xcode-select -s "/Applications/Xcode_15.2.app" + run: sudo xcode-select -s "/Applications/Xcode_15.3.app" - name: Cache Carthage uses: actions/cache@v4 diff --git a/.github/workflows/lint-pr.yaml b/.github/workflows/lint-pr.yaml index cb6ac410..0618ad7d 100644 --- a/.github/workflows/lint-pr.yaml +++ b/.github/workflows/lint-pr.yaml @@ -13,7 +13,7 @@ jobs: build: name: "Lint 🧹" if: github.event.pull_request.draft == false - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout diff --git a/Shared/Objects/PosterType.swift b/Shared/Objects/PosterType.swift index 8a7f9814..7a105b87 100644 --- a/Shared/Objects/PosterType.swift +++ b/Shared/Objects/PosterType.swift @@ -10,7 +10,8 @@ import Defaults import SwiftUI // TODO: Rename to `PosterDisplayType` or `PosterDisplay`? -// TODO: in Swift 5.10, nest under `Poster` (also when GitHub CI has Xcode 15.3) +// TODO: after no longer experimental, nest under `Poster` +// tracker: https://github.com/apple/swift-evolution/blob/main/proposals/0404-nested-protocols.md enum PosterType: String, CaseIterable, Displayable, Defaults.Serializable { case landscape diff --git a/Swiftfin.xcodeproj/project.pbxproj b/Swiftfin.xcodeproj/project.pbxproj index e3a66f1e..dbe3313a 100644 --- a/Swiftfin.xcodeproj/project.pbxproj +++ b/Swiftfin.xcodeproj/project.pbxproj @@ -3072,7 +3072,7 @@ New, ); LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1520; + LastUpgradeCheck = 1530; TargetAttributes = { 5358705F2669D21600D05A09 = { CreatedOnToolsVersion = 12.5; @@ -4074,6 +4074,7 @@ DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Swiftfin tvOS/Resources/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -4103,6 +4104,7 @@ DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Swiftfin tvOS/Resources/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -4159,6 +4161,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = ""; "EXCLUDED_ARCHS[sdk=*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4224,6 +4227,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; @@ -4257,6 +4261,7 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Swiftfin/Resources/Info.plist; @@ -4296,6 +4301,7 @@ DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Swiftfin/Resources/Info.plist; diff --git a/Swiftfin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Swiftfin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b3822c78..9853680e 100644 --- a/Swiftfin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Swiftfin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "014f7f9b582fe941e86e045d02b91ba05b36a8317ab6be0cd706443a529fc2da", "pins" : [ { "identity" : "blurhashkit", @@ -104,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/jellyfin/jellyfin-sdk-swift.git", "state" : { - "revision" : "ecc338b4ac0a817df36e087799d7077252489ccc", - "version" : "0.3.2" + "revision" : "30957ea3fe007eaecb203d16217c0c07dc3bcd8e", + "version" : "0.3.3" } }, { @@ -113,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/kean/Nuke", "state" : { - "revision" : "8ecbfc886da39bccb01c34abef5f2ff4073ad633", - "version" : "12.4.0" + "revision" : "4625c73ea00a9fb4b4f3e28d95d0021a44af7e59", + "version" : "12.5.0" } }, { @@ -141,7 +142,7 @@ "location" : "https://github.com/rundfunk47/stinsen", "state" : { "branch" : "master", - "revision" : "6dda57096e16020342b36ebea86dc4bdf6783426" + "revision" : "d6ad23f4c68212fed8ac64c739bef224628776e3" } }, { @@ -235,5 +236,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme b/Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme index ce949bc4..151ec61e 100644 --- a/Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme +++ b/Swiftfin.xcodeproj/xcshareddata/xcschemes/Swiftfin tvOS.xcscheme @@ -1,6 +1,6 @@