diff --git a/LyricsX.xcodeproj/project.pbxproj b/LyricsX.xcodeproj/project.pbxproj index b6d4d88d..910148f3 100644 --- a/LyricsX.xcodeproj/project.pbxproj +++ b/LyricsX.xcodeproj/project.pbxproj @@ -540,7 +540,6 @@ BB4141A81E458BA800A51775 /* Resources */, BB4141CA1E46CDD700A51775 /* Embed Frameworks */, BB60F3111E889FC000BA1FD2 /* Copy Helper */, - BB0A3AE2228058B3006C2E52 /* Sign Sparkle */, BB9163341F36371700E4E01C /* Upload dSYM */, BB0BE9531F444BE20068FF67 /* Update Localization */, BBC1D5811E4AFE64008869EC /* Bump Build */, @@ -802,24 +801,6 @@ shellPath = /bin/sh; shellScript = "/usr/libexec/PlistBuddy -c \"Set :LX_BUILD_TIME $(date +\"%s\")\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\n"; }; - BB0A3AE2228058B3006C2E52 /* Sign Sparkle */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Sign Sparkle"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\n\n# By default, use the configured code signing identity for the project/target\nIDENTITY=\"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\nif [ \"$IDENTITY\" == \"\" ]\nthen\n# If a code signing identity is not specified, use ad hoc signing\nIDENTITY=\"-\"\nfi\ncodesign --verbose --force --deep -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A/Resources/AutoUpdate.app\"\ncodesign --verbose --force -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\"\n"; - }; BB0BE9531F444BE20068FF67 /* Update Localization */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1483,7 +1464,7 @@ repositoryURL = "https://github.com/ddddxxx/MusicPlayer"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 0.7.2; + minimumVersion = 0.7.3; }; }; BBA82EF9256AB1490076831F /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */ = { diff --git a/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2509959e..e3081a92 100644 --- a/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/ddddxxx/MusicPlayer", "state": { "branch": null, - "revision": "06e040a3403c0fb84da1da17be5b3279d9d5156f", - "version": "0.7.2" + "revision": "34d5e23c5e1b4932124c83dd58d2be590fcf2b9f", + "version": "0.7.3" } }, { diff --git a/LyricsX/Component/AppDelegate.swift b/LyricsX/Component/AppDelegate.swift index 4d42d87f..6854bb57 100644 --- a/LyricsX/Component/AppDelegate.swift +++ b/LyricsX/Component/AppDelegate.swift @@ -154,13 +154,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation, NSMenu @IBAction func aboutLyricsXAction(_ sender: Any) { if #available(OSX 10.13, *) { - let version = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String #if IS_FOR_MAS let channel = "App Store" #else let channel = "GitHub" #endif - let versionString = "\(channel) Version \(version)" + let versionString = "\(channel) Version \(Bundle.main.semanticVersion!)" NSApp.orderFrontStandardAboutPanel(options: [.applicationVersion: versionString]) } else { NSApp.orderFrontStandardAboutPanel(sender) @@ -256,7 +255,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation, NSMenu .chineseConversionIndex: isHant ? 2 : 0, .desktopLyricsXPositionFactor: 0.5, .desktopLyricsYPositionFactor: 0.9, - ]) + ]) } } diff --git a/LyricsX/Supporting Files/Info.plist b/LyricsX/Supporting Files/Info.plist index 2e1fbae9..eb38e353 100644 --- a/LyricsX/Supporting Files/Info.plist +++ b/LyricsX/Supporting Files/Info.plist @@ -34,7 +34,7 @@ CFBundleShortVersionString 1.6.1 CFBundleVersion - 2341 + 2344 Fabric APIKey @@ -58,7 +58,7 @@ LSUIElement LX_BUILD_TIME - 1622446048 + 1622460550 NSAppTransportSecurity NSExceptionDomains diff --git a/LyricsXHelper/AppDelegate.swift b/LyricsXHelper/AppDelegate.swift index e574e455..a2adaf48 100644 --- a/LyricsXHelper/AppDelegate.swift +++ b/LyricsXHelper/AppDelegate.swift @@ -70,7 +70,7 @@ let playerBundleIdentifiers = [ ["com.apple.Music", "com.apple.iTunes"], ["com.spotify.client"], ["com.coppertino.Vox"], - ["com.audirvana.Audirvana", "com.audirvana.Audirvana-Plus"], + ["com.audirvana.Audirvana-Studio", "com.audirvana.Audirvana", "com.audirvana.Audirvana-Plus"], ["com.swinsian.Swinsian"], ] diff --git a/README.md b/README.md index bf7ae013..53504f97 100644 --- a/README.md +++ b/README.md @@ -6,24 +6,34 @@ -LyricsX is a plugin for iTunes, Spotify and Vox, which auto search and download lyrics for the current playing from Internet, and displays them in the desktop and menubar. +Ultimate lyrics app for macOS. [LyricsX for iOS](https://github.com/ddddxxx/LyricsX-iOS) and [lyricsx-cli for Linux](https://github.com/ddddxxx/lyricsx-cli) is in early development. ## Installation -LyricsX is available on the Mac App Store. +### Homebrew + +``` +$ brew install lyricsx +``` + +### Mac App Store [![download on the Mac App Store](docs/img/MAS_badge.svg)](https://itunes.apple.com/us/app/lyricsx/id1254743014?mt=12) +### Manual + +Download from [releases](https://github.com/ddddxxx/LyricsX/releases). + ### Requirements - macOS 10.11+ ## Features -- Work perfectly with iTunes, Spotify and Vox. -- Automatically search & download live lyrics. +- Work perfectly with your favorite music players. [List of supported players](https://github.com/ddddxxx/MusicPlayer#supported-players) +- Automatically search & download live lyrics from various lyrics sources. [List of supported sources](https://github.com/ddddxxx/LyricsKit#supported-sources) - Display lyrics on desktop and menubar. you can customize font, color and position. - Adjust lyrics offset on status menu. - Navigate the song with lyrics - Double click a line to jump to specific position. @@ -31,15 +41,6 @@ LyricsX is available on the Mac App Store. - Auto launch & quit with music player. - Automatic conversion between Traditional Chinese and Simplified Chinese. -### Lyrics Sources - -- 163 Music -- QQ Music -- Kugou Music -- Xiami Music -- TTPod -- Gecimi - ## Screenshot