From 3c737b33b0d60ae4397e3384c9bfdcde67896bae Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Tue, 17 Dec 2024 14:35:07 -0500 Subject: [PATCH] Update dependencies --- Persephone.xcodeproj/project.pbxproj | 73 +-------- .../xcshareddata/swiftpm/Package.resolved | 151 +++++++++--------- libmpdclient | 2 +- 3 files changed, 79 insertions(+), 147 deletions(-) diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index 0f37df4..c41eaa3 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -134,16 +134,6 @@ E48051522425626300362CF3 /* MPDServerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4405191227644340090CD6F /* MPDServerController.swift */; }; E48058282426D73500362CF3 /* version.h.in in Resources */ = {isa = PBXBuildFile; fileRef = E48056D82426D73400362CF3 /* version.h.in */; }; E48058292426D73500362CF3 /* version.h.in in Resources */ = {isa = PBXBuildFile; fileRef = E48056D82426D73400362CF3 /* version.h.in */; }; - E480590E2426D73600362CF3 /* configure.py in Resources */ = {isa = PBXBuildFile; fileRef = E48057752426D73400362CF3 /* configure.py */; }; - E480590F2426D73600362CF3 /* configure.py in Resources */ = {isa = PBXBuildFile; fileRef = E48057752426D73400362CF3 /* configure.py */; }; - E48059102426D73600362CF3 /* win64.txt in Resources */ = {isa = PBXBuildFile; fileRef = E48057772426D73400362CF3 /* win64.txt */; }; - E48059112426D73600362CF3 /* win64.txt in Resources */ = {isa = PBXBuildFile; fileRef = E48057772426D73400362CF3 /* win64.txt */; }; - E48059122426D73600362CF3 /* win32.txt in Resources */ = {isa = PBXBuildFile; fileRef = E48057782426D73400362CF3 /* win32.txt */; }; - E48059132426D73600362CF3 /* win32.txt in Resources */ = {isa = PBXBuildFile; fileRef = E48057782426D73400362CF3 /* win32.txt */; }; - E48059142426D73600362CF3 /* build.sh in Resources */ = {isa = PBXBuildFile; fileRef = E48057792426D73400362CF3 /* build.sh */; }; - E48059152426D73600362CF3 /* build.sh in Resources */ = {isa = PBXBuildFile; fileRef = E48057792426D73400362CF3 /* build.sh */; }; - E48059C02426D73600362CF3 /* libmpdclient.vapi in Resources */ = {isa = PBXBuildFile; fileRef = E48057D82426D73400362CF3 /* libmpdclient.vapi */; }; - E48059C12426D73600362CF3 /* libmpdclient.vapi in Resources */ = {isa = PBXBuildFile; fileRef = E48057D82426D73400362CF3 /* libmpdclient.vapi */; }; E48059C22426D73600362CF3 /* directory.c in Sources */ = {isa = PBXBuildFile; fileRef = E48057DA2426D73400362CF3 /* directory.c */; }; E48059C32426D73600362CF3 /* directory.c in Sources */ = {isa = PBXBuildFile; fileRef = E48057DA2426D73400362CF3 /* directory.c */; }; E48059C42426D73600362CF3 /* replay_gain.c in Sources */ = {isa = PBXBuildFile; fileRef = E48057DB2426D73400362CF3 /* replay_gain.c */; }; @@ -526,11 +516,6 @@ E48056F02426D73400362CF3 /* capabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = capabilities.h; sourceTree = ""; }; E48056F12426D73400362CF3 /* queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = queue.h; sourceTree = ""; }; E48056F22426D73400362CF3 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = playlist.h; sourceTree = ""; }; - E48057752426D73400362CF3 /* configure.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = configure.py; sourceTree = ""; }; - E48057772426D73400362CF3 /* win64.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = win64.txt; sourceTree = ""; }; - E48057782426D73400362CF3 /* win32.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = win32.txt; sourceTree = ""; }; - E48057792426D73400362CF3 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; - E48057D82426D73400362CF3 /* libmpdclient.vapi */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = libmpdclient.vapi; sourceTree = ""; }; E48057DA2426D73400362CF3 /* directory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = directory.c; sourceTree = ""; }; E48057DB2426D73400362CF3 /* replay_gain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = replay_gain.c; sourceTree = ""; }; E48057DC2426D73400362CF3 /* cplaylist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cplaylist.c; sourceTree = ""; }; @@ -1024,8 +1009,6 @@ isa = PBXGroup; children = ( E48056CA2426D73300362CF3 /* include */, - E48057742426D73400362CF3 /* build */, - E48057D72426D73400362CF3 /* vapi */, E48057D92426D73400362CF3 /* src */, ); path = libmpdclient; @@ -1085,33 +1068,6 @@ path = mpd; sourceTree = ""; }; - E48057742426D73400362CF3 /* build */ = { - isa = PBXGroup; - children = ( - E48057752426D73400362CF3 /* configure.py */, - E48057762426D73400362CF3 /* cross */, - E48057792426D73400362CF3 /* build.sh */, - ); - path = build; - sourceTree = ""; - }; - E48057762426D73400362CF3 /* cross */ = { - isa = PBXGroup; - children = ( - E48057772426D73400362CF3 /* win64.txt */, - E48057782426D73400362CF3 /* win32.txt */, - ); - path = cross; - sourceTree = ""; - }; - E48057D72426D73400362CF3 /* vapi */ = { - isa = PBXGroup; - children = ( - E48057D82426D73400362CF3 /* libmpdclient.vapi */, - ); - path = vapi; - sourceTree = ""; - }; E48057D92426D73400362CF3 /* src */ = { isa = PBXGroup; children = ( @@ -1300,19 +1256,6 @@ path = Protocols; sourceTree = ""; }; - E4D4FAE6246F4B1B00CD02AF /* Now Playing */ = { - isa = PBXGroup; - children = ( - E403E63C246F4C3900200F58 /* NowPlayingBarViewController.swift */, - E403E63D246F4C3900200F58 /* NowPlayingBarViewController.xib */, - E4F365D024942C6A006A8C4A /* NowPlayingTabBarController.swift */, - E4F365D3249432C0006A8C4A /* NowPlayingTabBar.swift */, - E4207C772576F7590089D21B /* NowPlayingViewController.swift */, - E4207C782576F75A0089D21B /* NowPlayingViewController.xib */, - ); - path = "Now Playing"; - sourceTree = ""; - }; E4E13C2C2350D8CB00092A6E /* Layouts */ = { isa = PBXGroup; children = ( @@ -1548,8 +1491,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E48059C02426D73600362CF3 /* libmpdclient.vapi in Resources */, - E48059102426D73600362CF3 /* win64.txt in Resources */, E45E4FDB22515D87004B537F /* Brewfile in Resources */, E42A8F3B22176D6400A13ED9 /* LICENSE.md in Resources */, E453825323FA0186007F6BFC /* VolumeControlView.xib in Resources */, @@ -1559,11 +1500,8 @@ E489E3A522B9D31800CA8CBD /* DraggedSongView.xib in Resources */, E40786202110CE70006887B1 /* Assets.xcassets in Resources */, E42A8F3C22176D6400A13ED9 /* README.md in Resources */, - E480590E2426D73600362CF3 /* configure.py in Resources */, - E48059142426D73600362CF3 /* build.sh in Resources */, E408D3CB220E341D0006D9BE /* AlbumViewItem.xib in Resources */, E40786232110CE70006887B1 /* Main.storyboard in Resources */, - E48059122426D73600362CF3 /* win32.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1585,16 +1523,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E41222132431425400473C1D /* LaunchScreen.storyboard in Resources */, - E41222142431425400473C1D /* Main.storyboard in Resources */, E4207C7A2576F75A0089D21B /* NowPlayingViewController.xib in Resources */, - E48059112426D73600362CF3 /* win64.txt in Resources */, - E480590F2426D73600362CF3 /* configure.py in Resources */, E48058292426D73500362CF3 /* version.h.in in Resources */, - E48059152426D73600362CF3 /* build.sh in Resources */, E403E63F246F4C3900200F58 /* NowPlayingBarViewController.xib in Resources */, - E48059132426D73600362CF3 /* win32.txt in Resources */, - E48059C12426D73600362CF3 /* libmpdclient.vapi in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2121,6 +2052,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Shared/libmpdclient/output", + "$(PROJECT_DIR)/libmpdclient/output", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = "0.18-alpha"; @@ -2157,6 +2089,7 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Shared/libmpdclient/output", + "$(PROJECT_DIR)/libmpdclient/output", ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = "0.18-alpha"; diff --git a/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index dcc7d27..c4fe1e3 100644 --- a/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Persephone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,79 +1,78 @@ { - "object": { - "pins": [ - { - "package": "CryptoSwift", - "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift", - "state": { - "branch": null, - "revision": "4e31051c63cc0ddf10a25cf5318856c510cf77f4", - "version": "1.4.0" - } - }, - { - "package": "Differ", - "repositoryURL": "https://github.com/tonyarnold/Differ", - "state": { - "branch": null, - "revision": "4c3eb4d76ad5c14075829397a5741b0badb08dce", - "version": "1.4.5" - } - }, - { - "package": "PMKFoundation", - "repositoryURL": "https://github.com/PromiseKit/Foundation", - "state": { - "branch": null, - "revision": "985f17fa69ee0e5b7eb3ff9be87ffc4e05fc0927", - "version": "3.4.0" - } - }, - { - "package": "Kingfisher", - "repositoryURL": "https://github.com/onevcat/Kingfisher.git", - "state": { - "branch": null, - "revision": "1a0c2df04b31ed7aa318354f3583faea24f006fc", - "version": "5.15.8" - } - }, - { - "package": "MediaKeyTap", - "repositoryURL": "https://github.com/danbee/MediaKeyTap", - "state": { - "branch": "add-package-swift", - "revision": "b6b83b1a3e78d25ad9c86a55babce4f60caf6fa4", - "version": null - } - }, - { - "package": "PromiseKit", - "repositoryURL": "https://github.com/mxcl/PromiseKit", - "state": { - "branch": null, - "revision": "f14f16cc2602afec1030e4f492100d6d43dca544", - "version": "6.13.1" - } - }, - { - "package": "ReSwift", - "repositoryURL": "https://github.com/ReSwift/ReSwift", - "state": { - "branch": null, - "revision": "b92762b5aa85c5e94053d942fbd37124ee939e5b", - "version": "5.0.0" - } - }, - { - "package": "SwiftyJSON", - "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON", - "state": { - "branch": null, - "revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07", - "version": "5.0.1" - } + "originHash" : "c1b9ccd259df3ccde312215364ddd78efc86b121d809721412a8f03ef2452cf7", + "pins" : [ + { + "identity" : "cryptoswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/CryptoSwift", + "state" : { + "revision" : "4e31051c63cc0ddf10a25cf5318856c510cf77f4", + "version" : "1.4.0" } - ] - }, - "version": 1 + }, + { + "identity" : "differ", + "kind" : "remoteSourceControl", + "location" : "https://github.com/tonyarnold/Differ", + "state" : { + "revision" : "4c3eb4d76ad5c14075829397a5741b0badb08dce", + "version" : "1.4.5" + } + }, + { + "identity" : "foundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/PromiseKit/Foundation", + "state" : { + "revision" : "985f17fa69ee0e5b7eb3ff9be87ffc4e05fc0927", + "version" : "3.4.0" + } + }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher.git", + "state" : { + "revision" : "1a0c2df04b31ed7aa318354f3583faea24f006fc", + "version" : "5.15.8" + } + }, + { + "identity" : "mediakeytap", + "kind" : "remoteSourceControl", + "location" : "https://github.com/danbee/MediaKeyTap", + "state" : { + "branch" : "add-package-swift", + "revision" : "b6b83b1a3e78d25ad9c86a55babce4f60caf6fa4" + } + }, + { + "identity" : "promisekit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mxcl/PromiseKit", + "state" : { + "revision" : "f14f16cc2602afec1030e4f492100d6d43dca544", + "version" : "6.13.1" + } + }, + { + "identity" : "reswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReSwift/ReSwift", + "state" : { + "revision" : "b92762b5aa85c5e94053d942fbd37124ee939e5b", + "version" : "5.0.0" + } + }, + { + "identity" : "swiftyjson", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SwiftyJSON/SwiftyJSON", + "state" : { + "revision" : "af76cf3ef710b6ca5f8c05f3a31307d44a3c5828", + "version" : "5.0.2" + } + } + ], + "version" : 3 } diff --git a/libmpdclient b/libmpdclient index 5097853..08e3c02 160000 --- a/libmpdclient +++ b/libmpdclient @@ -1 +1 @@ -Subproject commit 50978539426f2e46706206296ba3852a04a20d63 +Subproject commit 08e3c02278f98c94a5cff9b92308b9c98ad7fb03