diff --git a/Shared/Navigation/AppSidebarNavigation.swift b/Shared/Navigation/AppSidebarNavigation.swift index 30244f2b..fcfdaa72 100644 --- a/Shared/Navigation/AppSidebarNavigation.swift +++ b/Shared/Navigation/AppSidebarNavigation.swift @@ -15,7 +15,7 @@ struct AppSidebarNavigation: View { var body: some View { #if os(iOS) - content.introspect(.viewController, on: .iOS(.v15, .v16, .v17)) { viewController in + content.introspect(.viewController, on: .iOS(.v15, .v16, .v17, .v18)) { viewController in // workaround for an empty supplementary view on launch // the supplementary view is determined by the default selection inside the // primary view, but the primary view is not loaded so its selection is not read diff --git a/Shared/Search/FocusableSearchTextField.swift b/Shared/Search/FocusableSearchTextField.swift index 39445b97..1fa32fe2 100644 --- a/Shared/Search/FocusableSearchTextField.swift +++ b/Shared/Search/FocusableSearchTextField.swift @@ -9,7 +9,7 @@ struct FocusableSearchTextField: View { var body: some View { SearchTextField() #if os(macOS) - .introspect(.textField, on: .macOS(.v12, .v13, .v14)) { textField in + .introspect(.textField, on: .macOS(.v12, .v13, .v14, .v15)) { textField in state.textField = textField } .onAppear { @@ -18,7 +18,7 @@ struct FocusableSearchTextField: View { } } #elseif os(iOS) - .introspect(.textField, on: .iOS(.v15, .v16, .v17)) { textField in + .introspect(.textField, on: .iOS(.v15, .v16, .v17, .v18)) { textField in state.textField = textField } .onChange(of: state.focused) { newValue in diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj index 00ada512..07f2729d 100644 --- a/Yattee.xcodeproj/project.pbxproj +++ b/Yattee.xcodeproj/project.pbxproj @@ -4913,7 +4913,7 @@ repositoryURL = "https://github.com/sindresorhus/Defaults"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 7.0.0; + minimumVersion = 7.3.1; }; }; 372AA40E286D067B0000B1DC /* XCRemoteSwiftPackageReference "Repeat" */ = { @@ -4928,8 +4928,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/hyperoslo/Cache.git"; requirement = { - branch = master; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 7.4.0; }; }; 375B8AAF28B57F4200397B31 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { @@ -4944,16 +4944,16 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/pinterest/PINCache"; requirement = { - branch = master; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 3.0.4; }; }; 379325D329A265A300181CF1 /* XCRemoteSwiftPackageReference "swift-log" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/yattee/swift-log.git"; + repositoryURL = "https://github.com/apple/swift-log.git"; requirement = { - branch = main; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 1.6.1; }; }; 3797104728D3D10600D5F53C /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */ = { @@ -4961,7 +4961,7 @@ repositoryURL = "https://github.com/SDWebImage/SDWebImageSwiftUI.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 2.1.0; + minimumVersion = 2.2.7; }; }; 3797757B268922D100DD52A8 /* XCRemoteSwiftPackageReference "siesta" */ = { @@ -4969,7 +4969,7 @@ repositoryURL = "https://github.com/bustoutsolutions/siesta"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 1.5.0; + minimumVersion = 1.5.2; }; }; 3799AC0728B03CEC001376F9 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */ = { @@ -4985,7 +4985,7 @@ repositoryURL = "https://github.com/Alamofire/Alamofire.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.0.0; + minimumVersion = 5.9.1; }; }; 37BD07C52698B27B003EBB87 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = { @@ -4993,7 +4993,7 @@ repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.1.3; + minimumVersion = 1.3.0; }; }; 37CF8B8228535E4F00B71E37 /* XCRemoteSwiftPackageReference "SDWebImage" */ = { @@ -5001,7 +5001,7 @@ repositoryURL = "https://github.com/SDWebImage/SDWebImage"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.19.1; + minimumVersion = 5.19.7; }; }; 37D4B19B2671817900C925CA /* XCRemoteSwiftPackageReference "SwiftyJSON" */ = { @@ -5009,7 +5009,7 @@ repositoryURL = "https://github.com/SwiftyJSON/SwiftyJSON.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.0.0; + minimumVersion = 5.0.2; }; }; 37EE6DC328A305AD00BFD632 /* XCRemoteSwiftPackageReference "Reachability" */ = { @@ -5017,7 +5017,7 @@ repositoryURL = "https://github.com/ashleymills/Reachability.swift"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.1.0; + minimumVersion = 5.2.3; }; }; 37FB2847272207F000A57617 /* XCRemoteSwiftPackageReference "SDWebImageWebPCoder" */ = { @@ -5025,7 +5025,7 @@ repositoryURL = "https://github.com/SDWebImage/SDWebImageWebPCoder.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.8.4; + minimumVersion = 0.14.6; }; }; 37FB285227220D8400A57617 /* XCRemoteSwiftPackageReference "SDWebImagePINPlugin" */ = { diff --git a/Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b10b8612..9e04feac 100644 --- a/Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "515d8e68c4a31658288fb3f94789ee539399b042082c08c39f4c03c27fd8860c", + "originHash" : "173de1b718eb898698eaba0221b46be9781899a652725709c8400d3ddfb01980", "pins" : [ { "identity" : "activelabel.swift", @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/hyperoslo/Cache.git", "state" : { - "branch" : "master", - "revision" : "81a0277cbc6b63f4e0cd6f42c4abefa1011bbfa9" + "revision" : "24e47109e31b2031cb26e25cc1b81b607496066c", + "version" : "7.4.0" } }, { @@ -69,8 +69,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pinterest/PINCache", "state" : { - "branch" : "master", - "revision" : "2fb85948463292c2e824148cf17dc62a4c217a94" + "revision" : "2fb85948463292c2e824148cf17dc62a4c217a94", + "version" : "3.0.4" } }, { @@ -148,10 +148,10 @@ { "identity" : "swift-log", "kind" : "remoteSourceControl", - "location" : "https://github.com/yattee/swift-log.git", + "location" : "https://github.com/apple/swift-log.git", "state" : { - "branch" : "main", - "revision" : "3f3dc1390a2f116894887c352792dc8d5fa9e875" + "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537", + "version" : "1.6.1" } }, { @@ -168,8 +168,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/siteline/SwiftUI-Introspect.git", "state" : { - "revision" : "121c146fe591b1320238d054ae35c81ffa45f45a", - "version" : "0.12.0" + "revision" : "807f73ce09a9b9723f12385e592b4e0aaebd3336", + "version" : "1.3.0" } }, {