Skip to content

Commit 1c8c534

Browse files
anhoderanhoder
committed
feat: 为musicfox优化歌词获取
1 parent c16b6a4 commit 1c8c534

File tree

7 files changed

+186
-209
lines changed

7 files changed

+186
-209
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
Product
2+
Carthage/
3+
xcuserdata/

‎LyricsX.xcodeproj/project.pbxproj

+18-22
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,9 @@
126126
BBB03F2D232FB3AF00A3879E /* GenericID in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F2C232FB3AF00A3879E /* GenericID */; };
127127
BBB03F30232FB40400A3879E /* Semver in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F2F232FB40400A3879E /* Semver */; };
128128
BBB03F3A2331D8A800A3879E /* OpenCC in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F392331D8A800A3879E /* OpenCC */; };
129-
BBB03F3D2331DACD00A3879E /* LyricsKit in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F3C2331DACD00A3879E /* LyricsKit */; };
130129
BBB03F3F2331DBB000A3879E /* GenericID in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F3E2331DBB000A3879E /* GenericID */; };
131130
BBB03F412331DBB000A3879E /* Semver in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F402331DBB000A3879E /* Semver */; };
132131
BBB03F432331DBB000A3879E /* OpenCC in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F422331DBB000A3879E /* OpenCC */; };
133-
BBB03F452331DBB000A3879E /* LyricsKit in Frameworks */ = {isa = PBXBuildFile; productRef = BBB03F442331DBB000A3879E /* LyricsKit */; };
134132
BBB9AAE31E57EE880078F91A /* SearchLyricsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB9AAE21E57EE880078F91A /* SearchLyricsViewController.swift */; };
135133
BBC1D35B1E485BA7002538A2 /* AppController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC1D35A1E485BA7002538A2 /* AppController.swift */; };
136134
BBC1D35F1E499A6D002538A2 /* Global.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC1D35E1E499A6D002538A2 /* Global.swift */; };
@@ -141,6 +139,7 @@
141139
BBE2A79824041E36004A7E93 /* CombineExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE2A79724041E36004A7E93 /* CombineExtension.swift */; };
142140
BBE2A79924041E36004A7E93 /* CombineExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE2A79724041E36004A7E93 /* CombineExtension.swift */; };
143141
BBE8FC751F6BEA6200122AFA /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE8FC741F6BEA6200122AFA /* Then.swift */; };
142+
C64BF4EB29CEF18E009B1703 /* LyricsKit in Frameworks */ = {isa = PBXBuildFile; productRef = C64BF4EA29CEF18E009B1703 /* LyricsKit */; };
144143
E91F76EB21211B8D00755698 /* PreferenceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91F76EA21211B8D00755698 /* PreferenceViewController.swift */; };
145144
E97593E42150F47900D80616 /* Polyfill.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97593E32150F47800D80616 /* Polyfill.swift */; };
146145
E97593E62150F6FB00D80616 /* IBInspection.swift in Sources */ = {isa = PBXBuildFile; fileRef = E97593E52150F6FB00D80616 /* IBInspection.swift */; };
@@ -330,6 +329,7 @@
330329
buildActionMask = 2147483647;
331330
files = (
332331
BBA82F0A256AB8620076831F /* Sparkle in Frameworks */,
332+
C64BF4EB29CEF18E009B1703 /* LyricsKit in Frameworks */,
333333
BB9C3D8323435A5700860698 /* MusicPlayer in Frameworks */,
334334
BB4141C81E46CDD700A51775 /* SnapKit.framework in Frameworks */,
335335
BBB03F3A2331D8A800A3879E /* OpenCC in Frameworks */,
@@ -341,7 +341,6 @@
341341
BBA82EFB256AB1490076831F /* AppCenterCrashes in Frameworks */,
342342
BBA82EFD256AB1490076831F /* AppCenterAnalytics in Frameworks */,
343343
BBB03F2D232FB3AF00A3879E /* GenericID in Frameworks */,
344-
BBB03F3D2331DACD00A3879E /* LyricsKit in Frameworks */,
345344
BB350ABE23D0613D00500146 /* CXExtensions in Frameworks */,
346345
);
347346
runOnlyForDeploymentPostprocessing = 0;
@@ -354,7 +353,6 @@
354353
BB6C75EA248B908F00804AEB /* TouchBarHelper in Frameworks */,
355354
BB003F01248F89B700860FF7 /* CXShim in Frameworks */,
356355
BBB03F3F2331DBB000A3879E /* GenericID in Frameworks */,
357-
BBB03F452331DBB000A3879E /* LyricsKit in Frameworks */,
358356
BB22681E234C908D008FAFED /* SwiftCF in Frameworks */,
359357
BBA82F03256AB29F0076831F /* AppCenterAnalytics in Frameworks */,
360358
BB350AC023D0614800500146 /* CXExtensions in Frameworks */,
@@ -553,7 +551,6 @@
553551
BBB03F2C232FB3AF00A3879E /* GenericID */,
554552
BBB03F2F232FB40400A3879E /* Semver */,
555553
BBB03F392331D8A800A3879E /* OpenCC */,
556-
BBB03F3C2331DACD00A3879E /* LyricsKit */,
557554
BB9C3D8223435A5700860698 /* MusicPlayer */,
558555
BB22681B234C9085008FAFED /* SwiftCF */,
559556
BB350ABD23D0613D00500146 /* CXExtensions */,
@@ -562,6 +559,7 @@
562559
BBA82EFA256AB1490076831F /* AppCenterCrashes */,
563560
BBA82EFC256AB1490076831F /* AppCenterAnalytics */,
564561
BBA82F09256AB8620076831F /* Sparkle */,
562+
C64BF4EA29CEF18E009B1703 /* LyricsKit */,
565563
);
566564
productName = LyricsX;
567565
productReference = BB4141AA1E458BA800A51775 /* LyricsX.app */;
@@ -590,7 +588,6 @@
590588
BBB03F3E2331DBB000A3879E /* GenericID */,
591589
BBB03F402331DBB000A3879E /* Semver */,
592590
BBB03F422331DBB000A3879E /* OpenCC */,
593-
BBB03F442331DBB000A3879E /* LyricsKit */,
594591
BB9C3D8423435A6300860698 /* MusicPlayer */,
595592
BB22681D234C908D008FAFED /* SwiftCF */,
596593
BB350ABF23D0614800500146 /* CXExtensions */,
@@ -703,14 +700,14 @@
703700
BBB03F2B232FB3AF00A3879E /* XCRemoteSwiftPackageReference "GenericID" */,
704701
BBB03F2E232FB40400A3879E /* XCRemoteSwiftPackageReference "Semver" */,
705702
BBB03F382331D8A800A3879E /* XCRemoteSwiftPackageReference "SwiftyOpenCC" */,
706-
BBB03F3B2331DACD00A3879E /* XCRemoteSwiftPackageReference "LyricsKit" */,
707703
BB9C3D8123435A5700860698 /* XCRemoteSwiftPackageReference "MusicPlayer" */,
708704
BB22681A234C9085008FAFED /* XCRemoteSwiftPackageReference "SwiftCF" */,
709705
BB350ABC23D0613D00500146 /* XCRemoteSwiftPackageReference "CXExtensions" */,
710706
BB6C75E6248B908500804AEB /* XCRemoteSwiftPackageReference "TouchBarHelper" */,
711707
BB003EFD248F89A700860FF7 /* XCRemoteSwiftPackageReference "CombineX" */,
712708
BBA82EF9256AB1490076831F /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */,
713709
BBA82F08256AB8620076831F /* XCRemoteSwiftPackageReference "Sparkle" */,
710+
C64BF4E929CEF18E009B1703 /* XCRemoteSwiftPackageReference "LyricsKit" */,
714711
);
715712
productRefGroup = BB4141AB1E458BA800A51775 /* Products */;
716713
projectDirPath = "";
@@ -841,7 +838,7 @@
841838
);
842839
runOnlyForDeploymentPostprocessing = 0;
843840
shellPath = /bin/sh;
844-
shellScript = "appcenter crashes upload-symbols --symbol \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n";
841+
shellScript = "appcenter crashes upload-symbols --symbol \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\" --app anhoder/lyricx-go-musicfox\n";
845842
};
846843
BB5078A822014C3900B695C3 /* Update Localization */ = {
847844
isa = PBXShellScriptBuildPhase;
@@ -884,7 +881,7 @@
884881
);
885882
runOnlyForDeploymentPostprocessing = 1;
886883
shellPath = /bin/sh;
887-
shellScript = "appcenter crashes upload-symbols --symbol \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n";
884+
shellScript = "appcenter crashes upload-symbols --symbol \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\" --app anhoder/lyricx-go-musicfox\n";
888885
};
889886
BBC1D5811E4AFE64008869EC /* Bump Build */ = {
890887
isa = PBXShellScriptBuildPhase;
@@ -1155,6 +1152,7 @@
11551152
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11561153
CLANG_WARN_UNREACHABLE_CODE = YES;
11571154
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1155+
CODE_SIGNING_ALLOWED = NO;
11581156
COMBINE_HIDPI_IMAGES = YES;
11591157
COPY_PHASE_STRIP = NO;
11601158
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1174,7 +1172,7 @@
11741172
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11751173
GCC_WARN_UNUSED_FUNCTION = YES;
11761174
GCC_WARN_UNUSED_VARIABLE = YES;
1177-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1175+
MACOSX_DEPLOYMENT_TARGET = 10.13;
11781176
MTL_ENABLE_DEBUG_INFO = YES;
11791177
ONLY_ACTIVE_ARCH = YES;
11801178
OTHER_SWIFT_FLAGS = "-DDEBUG";
@@ -1216,6 +1214,7 @@
12161214
CLANG_WARN_SUSPICIOUS_MOVE = YES;
12171215
CLANG_WARN_UNREACHABLE_CODE = YES;
12181216
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1217+
CODE_SIGNING_ALLOWED = NO;
12191218
COMBINE_HIDPI_IMAGES = YES;
12201219
COPY_PHASE_STRIP = NO;
12211220
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -1229,7 +1228,7 @@
12291228
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12301229
GCC_WARN_UNUSED_FUNCTION = YES;
12311230
GCC_WARN_UNUSED_VARIABLE = YES;
1232-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1231+
MACOSX_DEPLOYMENT_TARGET = 10.13;
12331232
MTL_ENABLE_DEBUG_INFO = NO;
12341233
OTHER_SWIFT_FLAGS = "-DRELEASE";
12351234
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1244,6 +1243,7 @@
12441243
isa = XCBuildConfiguration;
12451244
buildSettings = {
12461245
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1246+
CODE_SIGNING_ALLOWED = NO;
12471247
CODE_SIGN_ENTITLEMENTS = "LyricsX/Supporting Files/LyricsX.entitlements";
12481248
CODE_SIGN_IDENTITY = "Mac Developer";
12491249
CODE_SIGN_STYLE = Automatic;
@@ -1268,6 +1268,7 @@
12681268
isa = XCBuildConfiguration;
12691269
buildSettings = {
12701270
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1271+
CODE_SIGNING_ALLOWED = NO;
12711272
CODE_SIGN_ENTITLEMENTS = "LyricsX/Supporting Files/LyricsX.entitlements";
12721273
CODE_SIGN_IDENTITY = "Mac Developer";
12731274
CODE_SIGN_STYLE = Automatic;
@@ -1507,12 +1508,12 @@
15071508
kind = branch;
15081509
};
15091510
};
1510-
BBB03F3B2331DACD00A3879E /* XCRemoteSwiftPackageReference "LyricsKit" */ = {
1511+
C64BF4E929CEF18E009B1703 /* XCRemoteSwiftPackageReference "LyricsKit" */ = {
15111512
isa = XCRemoteSwiftPackageReference;
1512-
repositoryURL = "https://github.com/ddddxxx/LyricsKit";
1513+
repositoryURL = "https://github.com/go-musicfox/LyricsKit.git";
15131514
requirement = {
1514-
kind = upToNextMinorVersion;
1515-
minimumVersion = 0.11.0;
1515+
kind = exactVersion;
1516+
version = "0.11.4-musicfox";
15161517
};
15171518
};
15181519
/* End XCRemoteSwiftPackageReference section */
@@ -1608,11 +1609,6 @@
16081609
package = BBB03F382331D8A800A3879E /* XCRemoteSwiftPackageReference "SwiftyOpenCC" */;
16091610
productName = OpenCC;
16101611
};
1611-
BBB03F3C2331DACD00A3879E /* LyricsKit */ = {
1612-
isa = XCSwiftPackageProductDependency;
1613-
package = BBB03F3B2331DACD00A3879E /* XCRemoteSwiftPackageReference "LyricsKit" */;
1614-
productName = LyricsKit;
1615-
};
16161612
BBB03F3E2331DBB000A3879E /* GenericID */ = {
16171613
isa = XCSwiftPackageProductDependency;
16181614
package = BBB03F2B232FB3AF00A3879E /* XCRemoteSwiftPackageReference "GenericID" */;
@@ -1628,9 +1624,9 @@
16281624
package = BBB03F382331D8A800A3879E /* XCRemoteSwiftPackageReference "SwiftyOpenCC" */;
16291625
productName = OpenCC;
16301626
};
1631-
BBB03F442331DBB000A3879E /* LyricsKit */ = {
1627+
C64BF4EA29CEF18E009B1703 /* LyricsKit */ = {
16321628
isa = XCSwiftPackageProductDependency;
1633-
package = BBB03F3B2331DACD00A3879E /* XCRemoteSwiftPackageReference "LyricsKit" */;
1629+
package = C64BF4E929CEF18E009B1703 /* XCRemoteSwiftPackageReference "LyricsKit" */;
16341630
productName = LyricsKit;
16351631
};
16361632
/* End XCSwiftPackageProductDependency section */

0 commit comments

Comments
 (0)