diff --git a/Persephone/App.swift b/Mac/App.swift similarity index 100% rename from Persephone/App.swift rename to Mac/App.swift diff --git a/Persephone/AppDelegate.swift b/Mac/AppDelegate.swift similarity index 100% rename from Persephone/AppDelegate.swift rename to Mac/AppDelegate.swift diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/Contents.json b/Mac/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Mac/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon128.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon128.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon128.png diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon128@2x.png diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon256.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon256.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon256.png diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon256@2x.png diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon512.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon512.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon512.png diff --git a/Persephone/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png b/Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png similarity index 100% rename from Persephone/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png rename to Mac/Assets.xcassets/AppIcon.appiconset/appIcon512@2x.png diff --git a/Persephone/Assets.xcassets/Contents.json b/Mac/Assets.xcassets/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/Contents.json rename to Mac/Assets.xcassets/Contents.json diff --git a/Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/Contents.json b/Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/Contents.json rename to Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon.png b/Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon.png similarity index 100% rename from Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon.png rename to Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon.png diff --git a/Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon@2x.png b/Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon@2x.png similarity index 100% rename from Persephone/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon@2x.png rename to Mac/Assets.xcassets/coverArtPreferencesIcon.imageset/coverArtPreferencesIcon@2x.png diff --git a/Persephone/Assets.xcassets/defaultCoverArt.imageset/Contents.json b/Mac/Assets.xcassets/defaultCoverArt.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/defaultCoverArt.imageset/Contents.json rename to Mac/Assets.xcassets/defaultCoverArt.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/defaultCoverArt.imageset/blankAlbumDark.pdf b/Mac/Assets.xcassets/defaultCoverArt.imageset/blankAlbumDark.pdf similarity index 100% rename from Persephone/Assets.xcassets/defaultCoverArt.imageset/blankAlbumDark.pdf rename to Mac/Assets.xcassets/defaultCoverArt.imageset/blankAlbumDark.pdf diff --git a/Persephone/Assets.xcassets/defaultCoverArt.imageset/blankAlbumLight.pdf b/Mac/Assets.xcassets/defaultCoverArt.imageset/blankAlbumLight.pdf similarity index 100% rename from Persephone/Assets.xcassets/defaultCoverArt.imageset/blankAlbumLight.pdf rename to Mac/Assets.xcassets/defaultCoverArt.imageset/blankAlbumLight.pdf diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/Contents.json b/Mac/Assets.xcassets/nextTrackButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/nextTrackButton.imageset/Contents.json rename to Mac/Assets.xcassets/nextTrackButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png b/Mac/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png similarity index 100% rename from Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png rename to Mac/Assets.xcassets/nextTrackButton.imageset/nextTrackButton.png diff --git a/Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png b/Mac/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png rename to Mac/Assets.xcassets/nextTrackButton.imageset/nextTrackButton@2x.png diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/Contents.json b/Mac/Assets.xcassets/pauseButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/pauseButton.imageset/Contents.json rename to Mac/Assets.xcassets/pauseButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton.png b/Mac/Assets.xcassets/pauseButton.imageset/pauseButton.png similarity index 100% rename from Persephone/Assets.xcassets/pauseButton.imageset/pauseButton.png rename to Mac/Assets.xcassets/pauseButton.imageset/pauseButton.png diff --git a/Persephone/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png b/Mac/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png rename to Mac/Assets.xcassets/pauseButton.imageset/pauseButton@2x.png diff --git a/Persephone/Assets.xcassets/playButton.imageset/Contents.json b/Mac/Assets.xcassets/playButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/playButton.imageset/Contents.json rename to Mac/Assets.xcassets/playButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/playButton.imageset/playButton.png b/Mac/Assets.xcassets/playButton.imageset/playButton.png similarity index 100% rename from Persephone/Assets.xcassets/playButton.imageset/playButton.png rename to Mac/Assets.xcassets/playButton.imageset/playButton.png diff --git a/Persephone/Assets.xcassets/playButton.imageset/playButton@2x.png b/Mac/Assets.xcassets/playButton.imageset/playButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/playButton.imageset/playButton@2x.png rename to Mac/Assets.xcassets/playButton.imageset/playButton@2x.png diff --git a/Persephone/Assets.xcassets/playButtonLarge.imageset/Contents.json b/Mac/Assets.xcassets/playButtonLarge.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/playButtonLarge.imageset/Contents.json rename to Mac/Assets.xcassets/playButtonLarge.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/playButtonLarge.imageset/playButtonLarge.png b/Mac/Assets.xcassets/playButtonLarge.imageset/playButtonLarge.png similarity index 100% rename from Persephone/Assets.xcassets/playButtonLarge.imageset/playButtonLarge.png rename to Mac/Assets.xcassets/playButtonLarge.imageset/playButtonLarge.png diff --git a/Persephone/Assets.xcassets/playButtonLarge.imageset/playButtonLarge@2x.png b/Mac/Assets.xcassets/playButtonLarge.imageset/playButtonLarge@2x.png similarity index 100% rename from Persephone/Assets.xcassets/playButtonLarge.imageset/playButtonLarge@2x.png rename to Mac/Assets.xcassets/playButtonLarge.imageset/playButtonLarge@2x.png diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/Contents.json b/Mac/Assets.xcassets/prevTrackButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/prevTrackButton.imageset/Contents.json rename to Mac/Assets.xcassets/prevTrackButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png b/Mac/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png similarity index 100% rename from Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png rename to Mac/Assets.xcassets/prevTrackButton.imageset/prevTrackButton.png diff --git a/Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png b/Mac/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png rename to Mac/Assets.xcassets/prevTrackButton.imageset/prevTrackButton@2x.png diff --git a/Persephone/Assets.xcassets/queuePauseButton.imageset/Contents.json b/Mac/Assets.xcassets/queuePauseButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/queuePauseButton.imageset/Contents.json rename to Mac/Assets.xcassets/queuePauseButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite.png b/Mac/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite.png similarity index 100% rename from Persephone/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite.png rename to Mac/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite.png diff --git a/Persephone/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite@2x.png b/Mac/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite@2x.png similarity index 100% rename from Persephone/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite@2x.png rename to Mac/Assets.xcassets/queuePauseButton.imageset/pauseButtonWhite@2x.png diff --git a/Persephone/Assets.xcassets/queuePlayButton.imageset/Contents.json b/Mac/Assets.xcassets/queuePlayButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/queuePlayButton.imageset/Contents.json rename to Mac/Assets.xcassets/queuePlayButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/queuePlayButton.imageset/playButtonWhite.png b/Mac/Assets.xcassets/queuePlayButton.imageset/playButtonWhite.png similarity index 100% rename from Persephone/Assets.xcassets/queuePlayButton.imageset/playButtonWhite.png rename to Mac/Assets.xcassets/queuePlayButton.imageset/playButtonWhite.png diff --git a/Persephone/Assets.xcassets/queuePlayButton.imageset/playButtonWhite@2x.png b/Mac/Assets.xcassets/queuePlayButton.imageset/playButtonWhite@2x.png similarity index 100% rename from Persephone/Assets.xcassets/queuePlayButton.imageset/playButtonWhite@2x.png rename to Mac/Assets.xcassets/queuePlayButton.imageset/playButtonWhite@2x.png diff --git a/Persephone/Assets.xcassets/repeatButton.imageset/Contents.json b/Mac/Assets.xcassets/repeatButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/repeatButton.imageset/Contents.json rename to Mac/Assets.xcassets/repeatButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/repeatButton.imageset/repeatButton.png b/Mac/Assets.xcassets/repeatButton.imageset/repeatButton.png similarity index 100% rename from Persephone/Assets.xcassets/repeatButton.imageset/repeatButton.png rename to Mac/Assets.xcassets/repeatButton.imageset/repeatButton.png diff --git a/Persephone/Assets.xcassets/repeatButton.imageset/repeatButton@2x.png b/Mac/Assets.xcassets/repeatButton.imageset/repeatButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/repeatButton.imageset/repeatButton@2x.png rename to Mac/Assets.xcassets/repeatButton.imageset/repeatButton@2x.png diff --git a/Persephone/Assets.xcassets/shuffleButton.imageset/Contents.json b/Mac/Assets.xcassets/shuffleButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/shuffleButton.imageset/Contents.json rename to Mac/Assets.xcassets/shuffleButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/shuffleButton.imageset/shuffleButton.png b/Mac/Assets.xcassets/shuffleButton.imageset/shuffleButton.png similarity index 100% rename from Persephone/Assets.xcassets/shuffleButton.imageset/shuffleButton.png rename to Mac/Assets.xcassets/shuffleButton.imageset/shuffleButton.png diff --git a/Persephone/Assets.xcassets/shuffleButton.imageset/shuffleButton@2x.png b/Mac/Assets.xcassets/shuffleButton.imageset/shuffleButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/shuffleButton.imageset/shuffleButton@2x.png rename to Mac/Assets.xcassets/shuffleButton.imageset/shuffleButton@2x.png diff --git a/Persephone/Assets.xcassets/songIcon.imageset/Contents.json b/Mac/Assets.xcassets/songIcon.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/songIcon.imageset/Contents.json rename to Mac/Assets.xcassets/songIcon.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/songIcon.imageset/songIcon.png b/Mac/Assets.xcassets/songIcon.imageset/songIcon.png similarity index 100% rename from Persephone/Assets.xcassets/songIcon.imageset/songIcon.png rename to Mac/Assets.xcassets/songIcon.imageset/songIcon.png diff --git a/Persephone/Assets.xcassets/songIcon.imageset/songIcon@2x.png b/Mac/Assets.xcassets/songIcon.imageset/songIcon@2x.png similarity index 100% rename from Persephone/Assets.xcassets/songIcon.imageset/songIcon@2x.png rename to Mac/Assets.xcassets/songIcon.imageset/songIcon@2x.png diff --git a/Persephone/Assets.xcassets/speakerDisabled.imageset/Contents.json b/Mac/Assets.xcassets/speakerDisabled.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/speakerDisabled.imageset/Contents.json rename to Mac/Assets.xcassets/speakerDisabled.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/speakerDisabled.imageset/speakerDisabled.png b/Mac/Assets.xcassets/speakerDisabled.imageset/speakerDisabled.png similarity index 100% rename from Persephone/Assets.xcassets/speakerDisabled.imageset/speakerDisabled.png rename to Mac/Assets.xcassets/speakerDisabled.imageset/speakerDisabled.png diff --git a/Persephone/Assets.xcassets/speakerDisabled.imageset/speakerDisabled@2x.png b/Mac/Assets.xcassets/speakerDisabled.imageset/speakerDisabled@2x.png similarity index 100% rename from Persephone/Assets.xcassets/speakerDisabled.imageset/speakerDisabled@2x.png rename to Mac/Assets.xcassets/speakerDisabled.imageset/speakerDisabled@2x.png diff --git a/Persephone/Assets.xcassets/speakerHigh.imageset/Contents.json b/Mac/Assets.xcassets/speakerHigh.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/speakerHigh.imageset/Contents.json rename to Mac/Assets.xcassets/speakerHigh.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/speakerHigh.imageset/speakerHigh.png b/Mac/Assets.xcassets/speakerHigh.imageset/speakerHigh.png similarity index 100% rename from Persephone/Assets.xcassets/speakerHigh.imageset/speakerHigh.png rename to Mac/Assets.xcassets/speakerHigh.imageset/speakerHigh.png diff --git a/Persephone/Assets.xcassets/speakerHigh.imageset/speakerHigh@2x.png b/Mac/Assets.xcassets/speakerHigh.imageset/speakerHigh@2x.png similarity index 100% rename from Persephone/Assets.xcassets/speakerHigh.imageset/speakerHigh@2x.png rename to Mac/Assets.xcassets/speakerHigh.imageset/speakerHigh@2x.png diff --git a/Persephone/Assets.xcassets/speakerLow.imageset/Contents.json b/Mac/Assets.xcassets/speakerLow.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/speakerLow.imageset/Contents.json rename to Mac/Assets.xcassets/speakerLow.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/speakerLow.imageset/speakerLow.png b/Mac/Assets.xcassets/speakerLow.imageset/speakerLow.png similarity index 100% rename from Persephone/Assets.xcassets/speakerLow.imageset/speakerLow.png rename to Mac/Assets.xcassets/speakerLow.imageset/speakerLow.png diff --git a/Persephone/Assets.xcassets/speakerLow.imageset/speakerLow@2x.png b/Mac/Assets.xcassets/speakerLow.imageset/speakerLow@2x.png similarity index 100% rename from Persephone/Assets.xcassets/speakerLow.imageset/speakerLow@2x.png rename to Mac/Assets.xcassets/speakerLow.imageset/speakerLow@2x.png diff --git a/Persephone/Assets.xcassets/speakerMid.imageset/Contents.json b/Mac/Assets.xcassets/speakerMid.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/speakerMid.imageset/Contents.json rename to Mac/Assets.xcassets/speakerMid.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/speakerMid.imageset/speakerMid.png b/Mac/Assets.xcassets/speakerMid.imageset/speakerMid.png similarity index 100% rename from Persephone/Assets.xcassets/speakerMid.imageset/speakerMid.png rename to Mac/Assets.xcassets/speakerMid.imageset/speakerMid.png diff --git a/Persephone/Assets.xcassets/speakerMid.imageset/speakerMid@2x.png b/Mac/Assets.xcassets/speakerMid.imageset/speakerMid@2x.png similarity index 100% rename from Persephone/Assets.xcassets/speakerMid.imageset/speakerMid@2x.png rename to Mac/Assets.xcassets/speakerMid.imageset/speakerMid@2x.png diff --git a/Persephone/Assets.xcassets/speakerOff.imageset/Contents.json b/Mac/Assets.xcassets/speakerOff.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/speakerOff.imageset/Contents.json rename to Mac/Assets.xcassets/speakerOff.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/speakerOff.imageset/speakerOff.png b/Mac/Assets.xcassets/speakerOff.imageset/speakerOff.png similarity index 100% rename from Persephone/Assets.xcassets/speakerOff.imageset/speakerOff.png rename to Mac/Assets.xcassets/speakerOff.imageset/speakerOff.png diff --git a/Persephone/Assets.xcassets/speakerOff.imageset/speakerOff@2x.png b/Mac/Assets.xcassets/speakerOff.imageset/speakerOff@2x.png similarity index 100% rename from Persephone/Assets.xcassets/speakerOff.imageset/speakerOff@2x.png rename to Mac/Assets.xcassets/speakerOff.imageset/speakerOff@2x.png diff --git a/Persephone/Assets.xcassets/stopButton.imageset/Contents.json b/Mac/Assets.xcassets/stopButton.imageset/Contents.json similarity index 100% rename from Persephone/Assets.xcassets/stopButton.imageset/Contents.json rename to Mac/Assets.xcassets/stopButton.imageset/Contents.json diff --git a/Persephone/Assets.xcassets/stopButton.imageset/stopButton.png b/Mac/Assets.xcassets/stopButton.imageset/stopButton.png similarity index 100% rename from Persephone/Assets.xcassets/stopButton.imageset/stopButton.png rename to Mac/Assets.xcassets/stopButton.imageset/stopButton.png diff --git a/Persephone/Assets.xcassets/stopButton.imageset/stopButton@2x.png b/Mac/Assets.xcassets/stopButton.imageset/stopButton@2x.png similarity index 100% rename from Persephone/Assets.xcassets/stopButton.imageset/stopButton@2x.png rename to Mac/Assets.xcassets/stopButton.imageset/stopButton@2x.png diff --git a/Persephone/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard similarity index 100% rename from Persephone/Base.lproj/Main.storyboard rename to Mac/Base.lproj/Main.storyboard diff --git a/Persephone/Components/Browser/Album Browser/AlbumCoverButton.swift b/Mac/Components/Browser/Album Browser/AlbumCoverButton.swift similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumCoverButton.swift rename to Mac/Components/Browser/Album Browser/AlbumCoverButton.swift diff --git a/Persephone/Components/Browser/Album Browser/AlbumDataSource.swift b/Mac/Components/Browser/Album Browser/AlbumDataSource.swift similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumDataSource.swift rename to Mac/Components/Browser/Album Browser/AlbumDataSource.swift diff --git a/Persephone/Components/Browser/Album Browser/AlbumViewController+NSCollectionViewDelegate.swift b/Mac/Components/Browser/Album Browser/AlbumViewController+NSCollectionViewDelegate.swift similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumViewController+NSCollectionViewDelegate.swift rename to Mac/Components/Browser/Album Browser/AlbumViewController+NSCollectionViewDelegate.swift diff --git a/Persephone/Components/Browser/Album Browser/AlbumViewController.swift b/Mac/Components/Browser/Album Browser/AlbumViewController.swift similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumViewController.swift rename to Mac/Components/Browser/Album Browser/AlbumViewController.swift diff --git a/Persephone/Components/Browser/Album Browser/AlbumViewItem.swift b/Mac/Components/Browser/Album Browser/AlbumViewItem.swift similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumViewItem.swift rename to Mac/Components/Browser/Album Browser/AlbumViewItem.swift diff --git a/Persephone/Components/Browser/Album Browser/AlbumViewItem.xib b/Mac/Components/Browser/Album Browser/AlbumViewItem.xib similarity index 100% rename from Persephone/Components/Browser/Album Browser/AlbumViewItem.xib rename to Mac/Components/Browser/Album Browser/AlbumViewItem.xib diff --git a/Persephone/Components/Browser/Album Detail/AlbumDetailSongListView.swift b/Mac/Components/Browser/Album Detail/AlbumDetailSongListView.swift similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumDetailSongListView.swift rename to Mac/Components/Browser/Album Detail/AlbumDetailSongListView.swift diff --git a/Persephone/Components/Browser/Album Detail/AlbumDetailSongRowView.swift b/Mac/Components/Browser/Album Detail/AlbumDetailSongRowView.swift similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumDetailSongRowView.swift rename to Mac/Components/Browser/Album Detail/AlbumDetailSongRowView.swift diff --git a/Persephone/Components/Browser/Album Detail/AlbumDetailView+NSTableViewDelegate.swift b/Mac/Components/Browser/Album Detail/AlbumDetailView+NSTableViewDelegate.swift similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumDetailView+NSTableViewDelegate.swift rename to Mac/Components/Browser/Album Detail/AlbumDetailView+NSTableViewDelegate.swift diff --git a/Persephone/Components/Browser/Album Detail/AlbumDetailView.swift b/Mac/Components/Browser/Album Detail/AlbumDetailView.swift similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumDetailView.swift rename to Mac/Components/Browser/Album Detail/AlbumDetailView.swift diff --git a/Persephone/Components/Browser/Album Detail/AlbumDetailView.xib b/Mac/Components/Browser/Album Detail/AlbumDetailView.xib similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumDetailView.xib rename to Mac/Components/Browser/Album Detail/AlbumDetailView.xib diff --git a/Persephone/Components/Browser/Album Detail/AlbumTracksDataSource.swift b/Mac/Components/Browser/Album Detail/AlbumTracksDataSource.swift similarity index 100% rename from Persephone/Components/Browser/Album Detail/AlbumTracksDataSource.swift rename to Mac/Components/Browser/Album Detail/AlbumTracksDataSource.swift diff --git a/Persephone/Components/Preferences/CoverArtPrefsController.swift b/Mac/Components/Preferences/CoverArtPrefsController.swift similarity index 100% rename from Persephone/Components/Preferences/CoverArtPrefsController.swift rename to Mac/Components/Preferences/CoverArtPrefsController.swift diff --git a/Persephone/Components/Preferences/GeneralPrefsViewController.swift b/Mac/Components/Preferences/GeneralPrefsViewController.swift similarity index 100% rename from Persephone/Components/Preferences/GeneralPrefsViewController.swift rename to Mac/Components/Preferences/GeneralPrefsViewController.swift diff --git a/Persephone/Components/Preferences/PreferencesViewController.swift b/Mac/Components/Preferences/PreferencesViewController.swift similarity index 100% rename from Persephone/Components/Preferences/PreferencesViewController.swift rename to Mac/Components/Preferences/PreferencesViewController.swift diff --git a/Persephone/Components/Preferences/PreferencesWindowController.swift b/Mac/Components/Preferences/PreferencesWindowController.swift similarity index 100% rename from Persephone/Components/Preferences/PreferencesWindowController.swift rename to Mac/Components/Preferences/PreferencesWindowController.swift diff --git a/Persephone/Components/Queue/CurrentCoverArtView.swift b/Mac/Components/Queue/CurrentCoverArtView.swift similarity index 100% rename from Persephone/Components/Queue/CurrentCoverArtView.swift rename to Mac/Components/Queue/CurrentCoverArtView.swift diff --git a/Persephone/Components/Queue/QueueDataSource.swift b/Mac/Components/Queue/QueueDataSource.swift similarity index 100% rename from Persephone/Components/Queue/QueueDataSource.swift rename to Mac/Components/Queue/QueueDataSource.swift diff --git a/Persephone/Components/Queue/QueueSongCoverView.swift b/Mac/Components/Queue/QueueSongCoverView.swift similarity index 100% rename from Persephone/Components/Queue/QueueSongCoverView.swift rename to Mac/Components/Queue/QueueSongCoverView.swift diff --git a/Persephone/Components/Queue/QueueSongInfoView.swift b/Mac/Components/Queue/QueueSongInfoView.swift similarity index 100% rename from Persephone/Components/Queue/QueueSongInfoView.swift rename to Mac/Components/Queue/QueueSongInfoView.swift diff --git a/Persephone/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift b/Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift similarity index 100% rename from Persephone/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift rename to Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift diff --git a/Persephone/Components/Queue/QueueViewController.swift b/Mac/Components/Queue/QueueViewController.swift similarity index 100% rename from Persephone/Components/Queue/QueueViewController.swift rename to Mac/Components/Queue/QueueViewController.swift diff --git a/Persephone/Components/Shared/DraggedSongView.swift b/Mac/Components/Shared/DraggedSongView.swift similarity index 100% rename from Persephone/Components/Shared/DraggedSongView.swift rename to Mac/Components/Shared/DraggedSongView.swift diff --git a/Persephone/Components/Shared/DraggedSongView.xib b/Mac/Components/Shared/DraggedSongView.xib similarity index 100% rename from Persephone/Components/Shared/DraggedSongView.xib rename to Mac/Components/Shared/DraggedSongView.xib diff --git a/Persephone/Components/Shared/Extensions/CGColor.swift b/Mac/Components/Shared/Extensions/CGColor.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/CGColor.swift rename to Mac/Components/Shared/Extensions/CGColor.swift diff --git a/Persephone/Components/Shared/Extensions/NSEvent.swift b/Mac/Components/Shared/Extensions/NSEvent.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSEvent.swift rename to Mac/Components/Shared/Extensions/NSEvent.swift diff --git a/Persephone/Components/Shared/Extensions/NSFont.swift b/Mac/Components/Shared/Extensions/NSFont.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSFont.swift rename to Mac/Components/Shared/Extensions/NSFont.swift diff --git a/Persephone/Components/Shared/Extensions/NSImage.swift b/Mac/Components/Shared/Extensions/NSImage.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSImage.swift rename to Mac/Components/Shared/Extensions/NSImage.swift diff --git a/Persephone/Components/Shared/Extensions/NSPasteboard.swift b/Mac/Components/Shared/Extensions/NSPasteboard.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSPasteboard.swift rename to Mac/Components/Shared/Extensions/NSPasteboard.swift diff --git a/Persephone/Components/Shared/Extensions/NSPasteboardItem.swift b/Mac/Components/Shared/Extensions/NSPasteboardItem.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSPasteboardItem.swift rename to Mac/Components/Shared/Extensions/NSPasteboardItem.swift diff --git a/Persephone/Components/Shared/Extensions/NSSize.swift b/Mac/Components/Shared/Extensions/NSSize.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSSize.swift rename to Mac/Components/Shared/Extensions/NSSize.swift diff --git a/Persephone/Components/Shared/Extensions/NSUserInterfaceItemIdentifier.swift b/Mac/Components/Shared/Extensions/NSUserInterfaceItemIdentifier.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSUserInterfaceItemIdentifier.swift rename to Mac/Components/Shared/Extensions/NSUserInterfaceItemIdentifier.swift diff --git a/Persephone/Components/Shared/Extensions/NSView.swift b/Mac/Components/Shared/Extensions/NSView.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/NSView.swift rename to Mac/Components/Shared/Extensions/NSView.swift diff --git a/Persephone/Components/Shared/Extensions/Notification.swift b/Mac/Components/Shared/Extensions/Notification.swift similarity index 100% rename from Persephone/Components/Shared/Extensions/Notification.swift rename to Mac/Components/Shared/Extensions/Notification.swift diff --git a/Persephone/Components/Shared/ImageDataProviders/MPDAlbumArtImageDataProvider.swift b/Mac/Components/Shared/ImageDataProviders/MPDAlbumArtImageDataProvider.swift similarity index 100% rename from Persephone/Components/Shared/ImageDataProviders/MPDAlbumArtImageDataProvider.swift rename to Mac/Components/Shared/ImageDataProviders/MPDAlbumArtImageDataProvider.swift diff --git a/Persephone/Components/Shared/Layouts/FlexibleGridViewLayout.swift b/Mac/Components/Shared/Layouts/FlexibleGridViewLayout.swift similarity index 100% rename from Persephone/Components/Shared/Layouts/FlexibleGridViewLayout.swift rename to Mac/Components/Shared/Layouts/FlexibleGridViewLayout.swift diff --git a/Persephone/Components/Shared/MPDServerController.swift b/Mac/Components/Shared/MPDServerController.swift similarity index 100% rename from Persephone/Components/Shared/MPDServerController.swift rename to Mac/Components/Shared/MPDServerController.swift diff --git a/Persephone/Components/Shared/MPDServerDelegate.swift b/Mac/Components/Shared/MPDServerDelegate.swift similarity index 100% rename from Persephone/Components/Shared/MPDServerDelegate.swift rename to Mac/Components/Shared/MPDServerDelegate.swift diff --git a/Persephone/Components/Shared/UserNotificationsController.swift b/Mac/Components/Shared/UserNotificationsController.swift similarity index 100% rename from Persephone/Components/Shared/UserNotificationsController.swift rename to Mac/Components/Shared/UserNotificationsController.swift diff --git a/Persephone/Components/VolumeControl/VolumeControlView.swift b/Mac/Components/VolumeControl/VolumeControlView.swift similarity index 100% rename from Persephone/Components/VolumeControl/VolumeControlView.swift rename to Mac/Components/VolumeControl/VolumeControlView.swift diff --git a/Persephone/Components/VolumeControl/VolumeControlView.xib b/Mac/Components/VolumeControl/VolumeControlView.xib similarity index 100% rename from Persephone/Components/VolumeControl/VolumeControlView.xib rename to Mac/Components/VolumeControl/VolumeControlView.xib diff --git a/Persephone/Components/Window/Base.lproj/Main.storyboard b/Mac/Components/Window/Base.lproj/Main.storyboard similarity index 100% rename from Persephone/Components/Window/Base.lproj/Main.storyboard rename to Mac/Components/Window/Base.lproj/Main.storyboard diff --git a/Persephone/Components/Window/MainSplitViewController.swift b/Mac/Components/Window/MainSplitViewController.swift similarity index 100% rename from Persephone/Components/Window/MainSplitViewController.swift rename to Mac/Components/Window/MainSplitViewController.swift diff --git a/Persephone/Components/Window/MainWindow.swift b/Mac/Components/Window/MainWindow.swift similarity index 100% rename from Persephone/Components/Window/MainWindow.swift rename to Mac/Components/Window/MainWindow.swift diff --git a/Persephone/Components/Window/WindowController.swift b/Mac/Components/Window/WindowController.swift similarity index 100% rename from Persephone/Components/Window/WindowController.swift rename to Mac/Components/Window/WindowController.swift diff --git a/Persephone/Info.plist b/Mac/Info.plist similarity index 100% rename from Persephone/Info.plist rename to Mac/Info.plist diff --git a/Persephone/Persephone.entitlements b/Mac/Persephone.entitlements similarity index 100% rename from Persephone/Persephone.entitlements rename to Mac/Persephone.entitlements diff --git a/Persephone/PersephoneBridgingHeader.h b/Mac/PersephoneBridgingHeader.h similarity index 100% rename from Persephone/PersephoneBridgingHeader.h rename to Mac/PersephoneBridgingHeader.h diff --git a/Persephone/Services/CoverArtService.swift b/Mac/Services/CoverArtService.swift similarity index 100% rename from Persephone/Services/CoverArtService.swift rename to Mac/Services/CoverArtService.swift diff --git a/Persephone/Services/SongNotifierService.swift b/Mac/Services/SongNotifierService.swift similarity index 100% rename from Persephone/Services/SongNotifierService.swift rename to Mac/Services/SongNotifierService.swift diff --git a/Persephone/State/Actions/AlbumListActions.swift b/Mac/State/Actions/AlbumListActions.swift similarity index 100% rename from Persephone/State/Actions/AlbumListActions.swift rename to Mac/State/Actions/AlbumListActions.swift diff --git a/Persephone/State/Actions/ArtistListActions.swift b/Mac/State/Actions/ArtistListActions.swift similarity index 100% rename from Persephone/State/Actions/ArtistListActions.swift rename to Mac/State/Actions/ArtistListActions.swift diff --git a/Persephone/State/Actions/PlayerActions.swift b/Mac/State/Actions/PlayerActions.swift similarity index 100% rename from Persephone/State/Actions/PlayerActions.swift rename to Mac/State/Actions/PlayerActions.swift diff --git a/Persephone/State/Actions/PreferencesActions.swift b/Mac/State/Actions/PreferencesActions.swift similarity index 100% rename from Persephone/State/Actions/PreferencesActions.swift rename to Mac/State/Actions/PreferencesActions.swift diff --git a/Persephone/State/Actions/QueueActions.swift b/Mac/State/Actions/QueueActions.swift similarity index 100% rename from Persephone/State/Actions/QueueActions.swift rename to Mac/State/Actions/QueueActions.swift diff --git a/Persephone/State/Actions/ServerActions.swift b/Mac/State/Actions/ServerActions.swift similarity index 100% rename from Persephone/State/Actions/ServerActions.swift rename to Mac/State/Actions/ServerActions.swift diff --git a/Persephone/State/Actions/UIActions.swift b/Mac/State/Actions/UIActions.swift similarity index 100% rename from Persephone/State/Actions/UIActions.swift rename to Mac/State/Actions/UIActions.swift diff --git a/Persephone/State/AlbumListState.swift b/Mac/State/AlbumListState.swift similarity index 100% rename from Persephone/State/AlbumListState.swift rename to Mac/State/AlbumListState.swift diff --git a/Persephone/State/AppState.swift b/Mac/State/AppState.swift similarity index 100% rename from Persephone/State/AppState.swift rename to Mac/State/AppState.swift diff --git a/Persephone/State/ArtistListState.swift b/Mac/State/ArtistListState.swift similarity index 100% rename from Persephone/State/ArtistListState.swift rename to Mac/State/ArtistListState.swift diff --git a/Persephone/State/PlayerState.swift b/Mac/State/PlayerState.swift similarity index 100% rename from Persephone/State/PlayerState.swift rename to Mac/State/PlayerState.swift diff --git a/Persephone/State/PreferencesState.swift b/Mac/State/PreferencesState.swift similarity index 100% rename from Persephone/State/PreferencesState.swift rename to Mac/State/PreferencesState.swift diff --git a/Persephone/State/QueueState.swift b/Mac/State/QueueState.swift similarity index 100% rename from Persephone/State/QueueState.swift rename to Mac/State/QueueState.swift diff --git a/Persephone/State/Reducers/AlbumListReducer.swift b/Mac/State/Reducers/AlbumListReducer.swift similarity index 100% rename from Persephone/State/Reducers/AlbumListReducer.swift rename to Mac/State/Reducers/AlbumListReducer.swift diff --git a/Persephone/State/Reducers/AppReducer.swift b/Mac/State/Reducers/AppReducer.swift similarity index 100% rename from Persephone/State/Reducers/AppReducer.swift rename to Mac/State/Reducers/AppReducer.swift diff --git a/Persephone/State/Reducers/ArtistReducer.swift b/Mac/State/Reducers/ArtistReducer.swift similarity index 100% rename from Persephone/State/Reducers/ArtistReducer.swift rename to Mac/State/Reducers/ArtistReducer.swift diff --git a/Persephone/State/Reducers/PlayerReducer.swift b/Mac/State/Reducers/PlayerReducer.swift similarity index 100% rename from Persephone/State/Reducers/PlayerReducer.swift rename to Mac/State/Reducers/PlayerReducer.swift diff --git a/Persephone/State/Reducers/PreferencesReducer.swift b/Mac/State/Reducers/PreferencesReducer.swift similarity index 100% rename from Persephone/State/Reducers/PreferencesReducer.swift rename to Mac/State/Reducers/PreferencesReducer.swift diff --git a/Persephone/State/Reducers/QueueReducer.swift b/Mac/State/Reducers/QueueReducer.swift similarity index 100% rename from Persephone/State/Reducers/QueueReducer.swift rename to Mac/State/Reducers/QueueReducer.swift diff --git a/Persephone/State/Reducers/ServerReducer.swift b/Mac/State/Reducers/ServerReducer.swift similarity index 100% rename from Persephone/State/Reducers/ServerReducer.swift rename to Mac/State/Reducers/ServerReducer.swift diff --git a/Persephone/State/Reducers/UIReducer.swift b/Mac/State/Reducers/UIReducer.swift similarity index 100% rename from Persephone/State/Reducers/UIReducer.swift rename to Mac/State/Reducers/UIReducer.swift diff --git a/Persephone/State/ServerState.swift b/Mac/State/ServerState.swift similarity index 100% rename from Persephone/State/ServerState.swift rename to Mac/State/ServerState.swift diff --git a/Persephone/State/UIState.swift b/Mac/State/UIState.swift similarity index 100% rename from Persephone/State/UIState.swift rename to Mac/State/UIState.swift diff --git a/PersephoneTests/Info.plist b/MacTests/Info.plist similarity index 100% rename from PersephoneTests/Info.plist rename to MacTests/Info.plist diff --git a/PersephoneTests/PersephoneTests.swift b/MacTests/PersephoneTests.swift similarity index 100% rename from PersephoneTests/PersephoneTests.swift rename to MacTests/PersephoneTests.swift diff --git a/PersephoneUITests/Info.plist b/MacUITests/Info.plist similarity index 100% rename from PersephoneUITests/Info.plist rename to MacUITests/Info.plist diff --git a/PersephoneUITests/PersephoneUITests.swift b/MacUITests/PersephoneUITests.swift similarity index 100% rename from PersephoneUITests/PersephoneUITests.swift rename to MacUITests/PersephoneUITests.swift diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj index ba98054..55a4930 100644 --- a/Persephone.xcodeproj/project.pbxproj +++ b/Persephone.xcodeproj/project.pbxproj @@ -374,15 +374,16 @@ E407860F2110CE6E006887B1 = { isa = PBXGroup; children = ( - E41B22BE21FB6B3300D544F6 /* Frameworks */, - E407861A2110CE6E006887B1 /* Persephone */, - E407862D2110CE70006887B1 /* PersephoneTests */, - E40786382110CE70006887B1 /* PersephoneUITests */, - E40786192110CE6E006887B1 /* Products */, E45E4FD822515D87004B537F /* Brewfile */, E45E4FD722515D87004B537F /* CHANGELOG.md */, + E41B22BE21FB6B3300D544F6 /* Frameworks */, E42A8F3922176D6400A13ED9 /* LICENSE.md */, + E407861A2110CE6E006887B1 /* Mac */, + E407862D2110CE70006887B1 /* MacTests */, + E40786382110CE70006887B1 /* MacUITests */, + E40786192110CE6E006887B1 /* Products */, E42A8F3A22176D6400A13ED9 /* README.md */, + E411C268241C02B2008B9682 /* Shared */, ); sourceTree = ""; }; @@ -396,41 +397,38 @@ name = Products; sourceTree = ""; }; - E407861A2110CE6E006887B1 /* Persephone */ = { + E407861A2110CE6E006887B1 /* Mac */ = { isa = PBXGroup; children = ( E44051932278765A0090CD6F /* App.swift */, E407861B2110CE6E006887B1 /* AppDelegate.swift */, E407861F2110CE70006887B1 /* Assets.xcassets */, E442CCC42347D5B900004E0C /* Components */, - E41B22C721FB966C00D544F6 /* include */, E40786242110CE70006887B1 /* Info.plist */, - E4F6B461221E124700ACF42A /* Models */, - E4A642DB220912FA00067D21 /* MPDClient */, E40786252110CE70006887B1 /* Persephone.entitlements */, E450AD9E2229B9BC0091BED3 /* PersephoneBridgingHeader.h */, E4A83BF2222207BE0098FED6 /* Services */, E4B11B64226A4F460075461B /* State */, ); - path = Persephone; + path = Mac; sourceTree = ""; }; - E407862D2110CE70006887B1 /* PersephoneTests */ = { + E407862D2110CE70006887B1 /* MacTests */ = { isa = PBXGroup; children = ( E407862E2110CE70006887B1 /* PersephoneTests.swift */, E40786302110CE70006887B1 /* Info.plist */, ); - path = PersephoneTests; + path = MacTests; sourceTree = ""; }; - E40786382110CE70006887B1 /* PersephoneUITests */ = { + E40786382110CE70006887B1 /* MacUITests */ = { isa = PBXGroup; children = ( E40786392110CE70006887B1 /* PersephoneUITests.swift */, E407863B2110CE70006887B1 /* Info.plist */, ); - path = PersephoneUITests; + path = MacUITests; sourceTree = ""; }; E408D3B7220DE8CC0006D9BE /* Extensions */ = { @@ -473,6 +471,16 @@ path = Extensions; sourceTree = ""; }; + E411C268241C02B2008B9682 /* Shared */ = { + isa = PBXGroup; + children = ( + E41B22C721FB966C00D544F6 /* include */, + E4F6B461221E124700ACF42A /* Models */, + E4A642DB220912FA00067D21 /* MPDClient */, + ); + path = Shared; + sourceTree = ""; + }; E41B22BE21FB6B3300D544F6 /* Frameworks */ = { isa = PBXGroup; children = ( diff --git a/Resources/Menus_DiamondSymbol.svg b/Resources/Menus_DiamondSymbol.svg new file mode 100644 index 0000000..3a59e9a --- /dev/null +++ b/Resources/Menus_DiamondSymbol.svg @@ -0,0 +1 @@ +menusSymbols \ No newline at end of file diff --git a/Resources/export/menuDiamond.png b/Resources/export/menuDiamond.png new file mode 100644 index 0000000..61eb5fe Binary files /dev/null and b/Resources/export/menuDiamond.png differ diff --git a/Resources/export/menuDiamond@2x.png b/Resources/export/menuDiamond@2x.png new file mode 100644 index 0000000..feca5e5 Binary files /dev/null and b/Resources/export/menuDiamond@2x.png differ diff --git a/Persephone/MPDClient/Extensions/MPDClient+Album.swift b/Shared/MPDClient/Extensions/MPDClient+Album.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Album.swift rename to Shared/MPDClient/Extensions/MPDClient+Album.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Artist.swift b/Shared/MPDClient/Extensions/MPDClient+Artist.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Artist.swift rename to Shared/MPDClient/Extensions/MPDClient+Artist.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Command.swift b/Shared/MPDClient/Extensions/MPDClient+Command.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Command.swift rename to Shared/MPDClient/Extensions/MPDClient+Command.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Connection.swift b/Shared/MPDClient/Extensions/MPDClient+Connection.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Connection.swift rename to Shared/MPDClient/Extensions/MPDClient+Connection.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Database.swift b/Shared/MPDClient/Extensions/MPDClient+Database.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Database.swift rename to Shared/MPDClient/Extensions/MPDClient+Database.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Error.swift b/Shared/MPDClient/Extensions/MPDClient+Error.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Error.swift rename to Shared/MPDClient/Extensions/MPDClient+Error.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Idle.swift b/Shared/MPDClient/Extensions/MPDClient+Idle.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Idle.swift rename to Shared/MPDClient/Extensions/MPDClient+Idle.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Mixer.swift b/Shared/MPDClient/Extensions/MPDClient+Mixer.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Mixer.swift rename to Shared/MPDClient/Extensions/MPDClient+Mixer.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Queue.swift b/Shared/MPDClient/Extensions/MPDClient+Queue.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Queue.swift rename to Shared/MPDClient/Extensions/MPDClient+Queue.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Songs.swift b/Shared/MPDClient/Extensions/MPDClient+Songs.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Songs.swift rename to Shared/MPDClient/Extensions/MPDClient+Songs.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Status.swift b/Shared/MPDClient/Extensions/MPDClient+Status.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Status.swift rename to Shared/MPDClient/Extensions/MPDClient+Status.swift diff --git a/Persephone/MPDClient/Extensions/MPDClient+Transport.swift b/Shared/MPDClient/Extensions/MPDClient+Transport.swift similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClient+Transport.swift rename to Shared/MPDClient/Extensions/MPDClient+Transport.swift diff --git a/Persephone/MPDClient/Extensions/MPDClientWrapper.c b/Shared/MPDClient/Extensions/MPDClientWrapper.c similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClientWrapper.c rename to Shared/MPDClient/Extensions/MPDClientWrapper.c diff --git a/Persephone/MPDClient/Extensions/MPDClientWrapper.h b/Shared/MPDClient/Extensions/MPDClientWrapper.h similarity index 100% rename from Persephone/MPDClient/Extensions/MPDClientWrapper.h rename to Shared/MPDClient/Extensions/MPDClientWrapper.h diff --git a/Persephone/MPDClient/Extensions/Persephone-Bridging-Header.h b/Shared/MPDClient/Extensions/Persephone-Bridging-Header.h similarity index 100% rename from Persephone/MPDClient/Extensions/Persephone-Bridging-Header.h rename to Shared/MPDClient/Extensions/Persephone-Bridging-Header.h diff --git a/Persephone/MPDClient/Extensions/RawRepresentable.swift b/Shared/MPDClient/Extensions/RawRepresentable.swift similarity index 100% rename from Persephone/MPDClient/Extensions/RawRepresentable.swift rename to Shared/MPDClient/Extensions/RawRepresentable.swift diff --git a/Persephone/MPDClient/MPDClient.swift b/Shared/MPDClient/MPDClient.swift similarity index 100% rename from Persephone/MPDClient/MPDClient.swift rename to Shared/MPDClient/MPDClient.swift diff --git a/Persephone/MPDClient/Models/MPDAlbum.swift b/Shared/MPDClient/Models/MPDAlbum.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDAlbum.swift rename to Shared/MPDClient/Models/MPDAlbum.swift diff --git a/Persephone/MPDClient/Models/MPDCommand.swift b/Shared/MPDClient/Models/MPDCommand.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDCommand.swift rename to Shared/MPDClient/Models/MPDCommand.swift diff --git a/Persephone/MPDClient/Models/MPDError.swift b/Shared/MPDClient/Models/MPDError.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDError.swift rename to Shared/MPDClient/Models/MPDError.swift diff --git a/Persephone/MPDClient/Models/MPDIdle.swift b/Shared/MPDClient/Models/MPDIdle.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDIdle.swift rename to Shared/MPDClient/Models/MPDIdle.swift diff --git a/Persephone/MPDClient/Models/MPDPair.swift b/Shared/MPDClient/Models/MPDPair.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDPair.swift rename to Shared/MPDClient/Models/MPDPair.swift diff --git a/Persephone/MPDClient/Models/MPDSong.swift b/Shared/MPDClient/Models/MPDSong.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDSong.swift rename to Shared/MPDClient/Models/MPDSong.swift diff --git a/Persephone/MPDClient/Models/MPDStatus.swift b/Shared/MPDClient/Models/MPDStatus.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDStatus.swift rename to Shared/MPDClient/Models/MPDStatus.swift diff --git a/Persephone/MPDClient/Models/MPDTag.swift b/Shared/MPDClient/Models/MPDTag.swift similarity index 100% rename from Persephone/MPDClient/Models/MPDTag.swift rename to Shared/MPDClient/Models/MPDTag.swift diff --git a/Persephone/MPDClient/Protocols/Delegate.swift b/Shared/MPDClient/Protocols/Delegate.swift similarity index 100% rename from Persephone/MPDClient/Protocols/Delegate.swift rename to Shared/MPDClient/Protocols/Delegate.swift diff --git a/Persephone/Models/Album.swift b/Shared/Models/Album.swift similarity index 100% rename from Persephone/Models/Album.swift rename to Shared/Models/Album.swift diff --git a/Persephone/Models/Artist.swift b/Shared/Models/Artist.swift similarity index 100% rename from Persephone/Models/Artist.swift rename to Shared/Models/Artist.swift diff --git a/Persephone/Models/DraggedAlbum.swift b/Shared/Models/DraggedAlbum.swift similarity index 100% rename from Persephone/Models/DraggedAlbum.swift rename to Shared/Models/DraggedAlbum.swift diff --git a/Persephone/Models/DraggedSong.swift b/Shared/Models/DraggedSong.swift similarity index 100% rename from Persephone/Models/DraggedSong.swift rename to Shared/Models/DraggedSong.swift diff --git a/Persephone/Models/DraggedSongType.swift b/Shared/Models/DraggedSongType.swift similarity index 100% rename from Persephone/Models/DraggedSongType.swift rename to Shared/Models/DraggedSongType.swift diff --git a/Persephone/Models/Loading.swift b/Shared/Models/Loading.swift similarity index 100% rename from Persephone/Models/Loading.swift rename to Shared/Models/Loading.swift diff --git a/Persephone/Models/MPDServer.swift b/Shared/Models/MPDServer.swift similarity index 100% rename from Persephone/Models/MPDServer.swift rename to Shared/Models/MPDServer.swift diff --git a/Persephone/Models/QueueItem.swift b/Shared/Models/QueueItem.swift similarity index 100% rename from Persephone/Models/QueueItem.swift rename to Shared/Models/QueueItem.swift diff --git a/Persephone/Models/Song.swift b/Shared/Models/Song.swift similarity index 100% rename from Persephone/Models/Song.swift rename to Shared/Models/Song.swift diff --git a/Persephone/Models/Time.swift b/Shared/Models/Time.swift similarity index 100% rename from Persephone/Models/Time.swift rename to Shared/Models/Time.swift diff --git a/Persephone/Models/TrackTimer.swift b/Shared/Models/TrackTimer.swift similarity index 100% rename from Persephone/Models/TrackTimer.swift rename to Shared/Models/TrackTimer.swift diff --git a/Persephone/include/module.modulemap b/Shared/include/module.modulemap similarity index 100% rename from Persephone/include/module.modulemap rename to Shared/include/module.modulemap diff --git a/Persephone/include/mpd b/Shared/include/mpd similarity index 100% rename from Persephone/include/mpd rename to Shared/include/mpd diff --git a/bin/update_build_number b/bin/update_build_number new file mode 100755 index 0000000..dd3d00e --- /dev/null +++ b/bin/update_build_number @@ -0,0 +1,13 @@ +#!/bin/sh + +git=`sh /etc/profile; which git` +appBuild=`$git rev-list --all | wc -l` +if [ $CONFIGURATION = "Debug" ]; then +branchName=`$git rev-parse --abbrev-ref HEAD` +/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $appBuild-$branchName" "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}" +/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $appBuild-$branchName" "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}.dSYM/Contents/Info.plist" +else +/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $appBuild" "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}" +/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $appBuild" "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}.dSYM/Contents/Info.plist" +fi +echo "Updated ${TARGET_BUILD_DIR}/${INFOPLIST_PATH}"