From 65f1fcf0d40d3dd9014bd73939585a29f494cdb0 Mon Sep 17 00:00:00 2001 From: cranci1 <100066266+cranci1@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:10:58 +0200 Subject: [PATCH] tetst --- .../Modules/ModuleAdditionSettingsView.swift | 4 +- Sora/Views/DownloadView.swift | 8 +- Sora/Views/LibraryView/AllBookmarks.swift | 4 +- Sora/Views/LibraryView/AllWatching.swift | 4 +- Sora/Views/LibraryView/LibraryView.swift | 8 +- .../MediaInfoView/AnilistMatchPopupView.swift | 2 +- .../EpisodeCell/EpisodeCell.swift | 2 +- Sora/Views/MediaInfoView/MediaInfoView.swift | 2 +- Sora/Views/SearchView/SearchResultsGrid.swift | 2 +- .../SearchView/SearchViewComponents.swift | 4 +- .../SettingsSubViews/SettingsViewAbout.swift | 6 +- .../SettingsSubViews/SettingsViewModule.swift | 2 +- .../SettingsViewTrackers.swift | 4 +- Sulfur.xcodeproj/project.pbxproj | 44 ++++++----- .../xcshareddata/swiftpm/Package.resolved | 78 +++++++------------ 15 files changed, 81 insertions(+), 93 deletions(-) diff --git a/Sora/Utils/Modules/ModuleAdditionSettingsView.swift b/Sora/Utils/Modules/ModuleAdditionSettingsView.swift index 758824c..11929c4 100644 --- a/Sora/Utils/Modules/ModuleAdditionSettingsView.swift +++ b/Sora/Utils/Modules/ModuleAdditionSettingsView.swift @@ -45,7 +45,7 @@ struct ModuleAdditionSettingsView: View { VStack(spacing: 24) { if let metadata = moduleMetadata { VStack(spacing: 0) { - LazyImage(source: URL(string: metadata.iconUrl)) { state in + LazyImage(url: URL(string: metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -72,7 +72,7 @@ struct ModuleAdditionSettingsView: View { .padding(.top, 6) HStack(spacing: 10) { - LazyImage(source: URL(string: metadata.author.icon)) { state in + LazyImage(url: URL(string: metadata.author.icon)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/DownloadView.swift b/Sora/Views/DownloadView.swift index 2c4d300..f8fe944 100644 --- a/Sora/Views/DownloadView.swift +++ b/Sora/Views/DownloadView.swift @@ -741,7 +741,7 @@ struct EnhancedActiveDownloadCard: View { HStack(spacing: 16) { Group { if let imageURL = download.imageURL { - LazyImage(source: imageURL) { state in + LazyImage(url: imageURL) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -904,7 +904,7 @@ struct EnhancedDownloadGroupCard: View { HStack(spacing: 16) { Group { if let posterURL = group.posterURL { - LazyImage(source: posterURL) { state in + LazyImage(url: posterURL) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -1008,7 +1008,7 @@ struct EnhancedShowEpisodesView: View { HStack(alignment: .top, spacing: 20) { Group { if let posterURL = group.posterURL { - LazyImage(source: posterURL) { state in + LazyImage(url: posterURL) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -1200,7 +1200,7 @@ struct EnhancedEpisodeRow: View { HStack(spacing: 16) { Group { if let backdropURL = asset.metadata?.backdropURL ?? asset.metadata?.posterURL { - LazyImage(source: backdropURL) { state in + LazyImage(url: backdropURL) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/LibraryView/AllBookmarks.swift b/Sora/Views/LibraryView/AllBookmarks.swift index d24fc94..374926d 100644 --- a/Sora/Views/LibraryView/AllBookmarks.swift +++ b/Sora/Views/LibraryView/AllBookmarks.swift @@ -59,7 +59,7 @@ struct BookmarkCell: View { var body: some View { if let module = moduleManager.modules.first(where: { $0.id.uuidString == bookmark.moduleId }) { ZStack { - LazyImage(source: URL(string: bookmark.imageUrl)) { state in + LazyImage(url: URL(string: bookmark.imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -79,7 +79,7 @@ struct BookmarkCell: View { .fill(Color.black.opacity(0.5)) .frame(width: 28, height: 28) .overlay( - LazyImage(source: URL(string: module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/LibraryView/AllWatching.swift b/Sora/Views/LibraryView/AllWatching.swift index 95a5940..878ac9f 100644 --- a/Sora/Views/LibraryView/AllWatching.swift +++ b/Sora/Views/LibraryView/AllWatching.swift @@ -206,7 +206,7 @@ struct FullWidthContinueWatchingCell: View { }) { GeometryReader { geometry in ZStack(alignment: .bottomLeading) { - LazyImage(source: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in + LazyImage(url: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -268,7 +268,7 @@ struct FullWidthContinueWatchingCell: View { .fill(Color.black.opacity(0.5)) .frame(width: 28, height: 28) .overlay( - LazyImage(source: URL(string: item.module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: item.module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/LibraryView/LibraryView.swift b/Sora/Views/LibraryView/LibraryView.swift index 030f142..1aa5829 100644 --- a/Sora/Views/LibraryView/LibraryView.swift +++ b/Sora/Views/LibraryView/LibraryView.swift @@ -286,7 +286,7 @@ struct ContinueWatchingCell: View { } }) { ZStack(alignment: .bottomLeading) { - LazyImage(source: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in + LazyImage(url: URL(string: item.imageUrl.isEmpty ? "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/main/assets/banner2.png" : item.imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -357,7 +357,7 @@ struct ContinueWatchingCell: View { .fill(Color.black.opacity(0.5)) .frame(width: 28, height: 28) .overlay( - LazyImage(source: URL(string: item.module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: item.module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -542,7 +542,7 @@ struct BookmarkItemView: View { isDetailActive = true }) { ZStack { - LazyImage(source: URL(string: item.imageUrl)) { state in + LazyImage(url: URL(string: item.imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -563,7 +563,7 @@ struct BookmarkItemView: View { .fill(Color.black.opacity(0.5)) .frame(width: 28, height: 28) .overlay( - LazyImage(source: URL(string: module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/MediaInfoView/AnilistMatchPopupView.swift b/Sora/Views/MediaInfoView/AnilistMatchPopupView.swift index 61aa2a2..3799b67 100644 --- a/Sora/Views/MediaInfoView/AnilistMatchPopupView.swift +++ b/Sora/Views/MediaInfoView/AnilistMatchPopupView.swift @@ -61,7 +61,7 @@ struct AnilistMatchPopupView: View { HStack(spacing: 12) { if let cover = result["cover"] as? String, let url = URL(string: cover) { - LazyImage(source: url) { state in + LazyImage(url: url) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift b/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift index 4681521..63788b4 100644 --- a/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift +++ b/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift @@ -264,7 +264,7 @@ struct EpisodeCell: View { private var episodeThumbnail: some View { ZStack { if let url = URL(string: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl) { - LazyImage(source: url) { state in + LazyImage(url: url) { state in if let image = state.imageContainer?.image { Image(uiImage: image) .resizable() diff --git a/Sora/Views/MediaInfoView/MediaInfoView.swift b/Sora/Views/MediaInfoView/MediaInfoView.swift index 1393194..be414be 100644 --- a/Sora/Views/MediaInfoView/MediaInfoView.swift +++ b/Sora/Views/MediaInfoView/MediaInfoView.swift @@ -240,7 +240,7 @@ struct MediaInfoView: View { private var mainScrollView: some View { ScrollView { ZStack(alignment: .top) { - LazyImage(source: URL(string: imageUrl)) { state in + LazyImage(url: URL(string: imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/SearchView/SearchResultsGrid.swift b/Sora/Views/SearchView/SearchResultsGrid.swift index 2d5db62..78b93cf 100644 --- a/Sora/Views/SearchView/SearchResultsGrid.swift +++ b/Sora/Views/SearchView/SearchResultsGrid.swift @@ -32,7 +32,7 @@ struct SearchResultsGrid: View { ForEach(items) { item in NavigationLink(destination: MediaInfoView(title: item.title, imageUrl: item.imageUrl, href: item.href, module: selectedModule)) { ZStack { - LazyImage(source: URL(string: item.imageUrl)) { state in + LazyImage(url: URL(string: item.imageUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/SearchView/SearchViewComponents.swift b/Sora/Views/SearchView/SearchViewComponents.swift index efce137..49c1201 100644 --- a/Sora/Views/SearchView/SearchViewComponents.swift +++ b/Sora/Views/SearchView/SearchViewComponents.swift @@ -27,7 +27,7 @@ struct ModuleSelectorMenu: View { onModuleSelected(module.id.uuidString) } label: { HStack { - LazyImage(source: URL(string: module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -56,7 +56,7 @@ struct ModuleSelectorMenu: View { Text(selectedModule.metadata.sourceName) .font(.headline) .foregroundColor(.primary) - LazyImage(source: URL(string: selectedModule.metadata.iconUrl)) { state in + LazyImage(url: URL(string: selectedModule.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift index 7f6ef7a..f6e3039 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift @@ -66,7 +66,7 @@ struct SettingsViewAbout: View { VStack(spacing: 24) { SettingsSection(title: "App Info", footer: "Sora/Sulfur will always remain free with no ADs!") { HStack(alignment: .center, spacing: 16) { - LazyImage(source: URL(string: "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/dev/Sora/Assets.xcassets/AppIcons/AppIcon_Default.appiconset/darkmode.png")) { state in + LazyImage(url: URL(string: "https://raw.githubusercontent.com/cranci1/Sora/refs/heads/dev/Sora/Assets.xcassets/AppIcons/AppIcon_Default.appiconset/darkmode.png")) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -100,7 +100,7 @@ struct SettingsViewAbout: View { } }) { HStack { - LazyImage(source: URL(string: "https://avatars.githubusercontent.com/u/100066266?v=4")) { state in + LazyImage(url: URL(string: "https://avatars.githubusercontent.com/u/100066266?v=4")) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -213,7 +213,7 @@ struct ContributorView: View { } }) { HStack { - LazyImage(source: URL(string: contributor.avatarUrl)) { state in + LazyImage(url: URL(string: contributor.avatarUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewModule.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewModule.swift index 58ffe02..a5611d9 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewModule.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewModule.swift @@ -67,7 +67,7 @@ fileprivate struct ModuleListItemView: View { var body: some View { VStack(spacing: 0) { HStack { - LazyImage(source: URL(string: module.metadata.iconUrl)) { state in + LazyImage(url: URL(string: module.metadata.iconUrl)) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewTrackers.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewTrackers.swift index 4299148..8dff56f 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewTrackers.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewTrackers.swift @@ -120,7 +120,7 @@ struct SettingsViewTrackers: View { SettingsSection(title: "AniList") { VStack(spacing: 0) { HStack(alignment: .center, spacing: 10) { - LazyImage(source: URL(string: "https://raw.githubusercontent.com/cranci1/Ryu/2f10226aa087154974a70c1ec78aa83a47daced9/Ryu/Assets.xcassets/Listing/Anilist.imageset/anilist.png")) { state in + LazyImage(url: URL(string: "https://raw.githubusercontent.com/cranci1/Ryu/2f10226aa087154974a70c1ec78aa83a47daced9/Ryu/Assets.xcassets/Listing/Anilist.imageset/anilist.png")) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() @@ -215,7 +215,7 @@ struct SettingsViewTrackers: View { SettingsSection(title: "Trakt") { VStack(spacing: 0) { HStack(alignment: .center, spacing: 10) { - LazyImage(source: URL(string: "https://static-00.iconduck.com/assets.00/trakt-icon-2048x2048-2633ksxg.png")) { state in + LazyImage(url: URL(string: "https://static-00.iconduck.com/assets.00/trakt-icon-2048x2048-2633ksxg.png")) { state in if let uiImage = state.imageContainer?.image { Image(uiImage: uiImage) .resizable() diff --git a/Sulfur.xcodeproj/project.pbxproj b/Sulfur.xcodeproj/project.pbxproj index c6ecca4..d9b6d74 100644 --- a/Sulfur.xcodeproj/project.pbxproj +++ b/Sulfur.xcodeproj/project.pbxproj @@ -32,6 +32,8 @@ 132AF1212D99951700A0140B /* JSController-Streams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1202D99951700A0140B /* JSController-Streams.swift */; }; 132AF1232D9995C300A0140B /* JSController-Details.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1222D9995C300A0140B /* JSController-Details.swift */; }; 132AF1252D9995F900A0140B /* JSController-Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 132AF1242D9995F900A0140B /* JSController-Search.swift */; }; + 13367ECC2DF70698009CB33F /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = 13367ECB2DF70698009CB33F /* Nuke */; }; + 13367ECE2DF70698009CB33F /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 13367ECD2DF70698009CB33F /* NukeUI */; }; 133D7C6E2D2BE2500075467E /* SoraApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C6D2D2BE2500075467E /* SoraApp.swift */; }; 133D7C702D2BE2500075467E /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 133D7C6F2D2BE2500075467E /* ContentView.swift */; }; 133D7C722D2BE2520075467E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 133D7C712D2BE2520075467E /* Assets.xcassets */; }; @@ -60,7 +62,6 @@ 1399FAD62D3AB3DB00E97C31 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1399FAD52D3AB3DB00E97C31 /* Logger.swift */; }; 13B77E202DA457AA00126FDF /* AniListPushUpdates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B77E1F2DA457AA00126FDF /* AniListPushUpdates.swift */; }; 13B7F4C12D58FFDD0045714A /* Shimmer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B7F4C02D58FFDD0045714A /* Shimmer.swift */; }; - 13BC689F2DF61327009A0651 /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 13BC689E2DF61327009A0651 /* NukeUI */; }; 13C0E5EA2D5F85EA00E7F619 /* ContinueWatchingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13C0E5E92D5F85EA00E7F619 /* ContinueWatchingManager.swift */; }; 13C0E5EC2D5F85F800E7F619 /* ContinueWatchingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13C0E5EB2D5F85F800E7F619 /* ContinueWatchingItem.swift */; }; 13CBA0882D60F19C00EFE70A /* VTTSubtitlesLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13CBA0872D60F19C00EFE70A /* VTTSubtitlesLoader.swift */; }; @@ -191,9 +192,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 13367ECC2DF70698009CB33F /* Nuke in Frameworks */, 13637B902DE0ECD200BDA2FC /* Drops in Frameworks */, 13637B932DE0ECDB00BDA2FC /* MarqueeLabel in Frameworks */, - 13BC689F2DF61327009A0651 /* NukeUI in Frameworks */, + 13367ECE2DF70698009CB33F /* NukeUI in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -616,7 +618,8 @@ packageProductDependencies = ( 13637B8F2DE0ECD200BDA2FC /* Drops */, 13637B922DE0ECDB00BDA2FC /* MarqueeLabel */, - 13BC689E2DF61327009A0651 /* NukeUI */, + 13367ECB2DF70698009CB33F /* Nuke */, + 13367ECD2DF70698009CB33F /* NukeUI */, ); productName = Sora; productReference = 133D7C6A2D2BE2500075467E /* Sulfur.app */; @@ -648,7 +651,7 @@ packageReferences = ( 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */, 13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */, - 13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */, + 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */, ); productRefGroup = 133D7C6B2D2BE2500075467E /* Products */; projectDirPath = ""; @@ -994,6 +997,14 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/kean/Nuke.git"; + requirement = { + branch = main; + kind = branch; + }; + }; 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/omaralbeik/Drops.git"; @@ -1006,21 +1017,23 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/cbpowell/MarqueeLabel"; requirement = { - kind = exactVersion; - version = 4.2.1; - }; - }; - 13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/kean/NukeUI"; - requirement = { - branch = main; + branch = master; kind = branch; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 13367ECB2DF70698009CB33F /* Nuke */ = { + isa = XCSwiftPackageProductDependency; + package = 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */; + productName = Nuke; + }; + 13367ECD2DF70698009CB33F /* NukeUI */ = { + isa = XCSwiftPackageProductDependency; + package = 13367ECA2DF70698009CB33F /* XCRemoteSwiftPackageReference "Nuke" */; + productName = NukeUI; + }; 13637B8F2DE0ECD200BDA2FC /* Drops */ = { isa = XCSwiftPackageProductDependency; package = 13637B8E2DE0ECD200BDA2FC /* XCRemoteSwiftPackageReference "Drops" */; @@ -1031,11 +1044,6 @@ package = 13637B912DE0ECDB00BDA2FC /* XCRemoteSwiftPackageReference "MarqueeLabel" */; productName = MarqueeLabel; }; - 13BC689E2DF61327009A0651 /* NukeUI */ = { - isa = XCSwiftPackageProductDependency; - package = 13BC689D2DF61327009A0651 /* XCRemoteSwiftPackageReference "NukeUI" */; - productName = NukeUI; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 133D7C622D2BE2500075467E /* Project object */; diff --git a/Sulfur.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Sulfur.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9c7f2bf..0b5a161 100644 --- a/Sulfur.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Sulfur.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,52 +1,32 @@ { - "object": { - "pins": [ - { - "package": "Drops", - "repositoryURL": "https://github.com/omaralbeik/Drops.git", - "state": { - "branch": "main", - "revision": "5824681795286c36bdc4a493081a63e64e2a064e", - "version": null - } - }, - { - "package": "Gifu", - "repositoryURL": "https://github.com/kaishin/Gifu", - "state": { - "branch": null, - "revision": "82da0086dea14ca9afc9801234ad8dc4cd9e2738", - "version": "3.4.1" - } - }, - { - "package": "MarqueeLabel", - "repositoryURL": "https://github.com/cbpowell/MarqueeLabel", - "state": { - "branch": null, - "revision": "cffb6938940d3242882e6a2f9170b7890a4729ea", - "version": "4.2.1" - } - }, - { - "package": "Nuke", - "repositoryURL": "https://github.com/kean/Nuke.git", - "state": { - "branch": null, - "revision": "a002b7fd786f2df2ed4333fe73a9727499fd9d97", - "version": "10.11.2" - } - }, - { - "package": "NukeUI", - "repositoryURL": "https://github.com/kean/NukeUI", - "state": { - "branch": "main", - "revision": "7338ed8ea76de18598bfafbca0cbdc74300a6b10", - "version": null - } + "pins" : [ + { + "identity" : "drops", + "kind" : "remoteSourceControl", + "location" : "https://github.com/omaralbeik/Drops.git", + "state" : { + "branch" : "main", + "revision" : "5824681795286c36bdc4a493081a63e64e2a064e" } - ] - }, - "version": 1 + }, + { + "identity" : "marqueelabel", + "kind" : "remoteSourceControl", + "location" : "https://github.com/cbpowell/MarqueeLabel", + "state" : { + "branch" : "master", + "revision" : "18e4787f4dc1c26d2d581c4bc9aeae34686eeeae" + } + }, + { + "identity" : "nuke", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kean/Nuke.git", + "state" : { + "branch" : "main", + "revision" : "c7ba4833b1b38f09e9708858aeaf91babc69f65c" + } + } + ], + "version" : 2 }