diff --git a/DarockBili.xcodeproj/project.pbxproj b/DarockBili.xcodeproj/project.pbxproj index 8d1c6b55b..a4ab7c322 100644 --- a/DarockBili.xcodeproj/project.pbxproj +++ b/DarockBili.xcodeproj/project.pbxproj @@ -43,7 +43,6 @@ 8C82F7942BB6EAB0009AEFD2 /* SemanticVersion.drkdatas in Resources */ = {isa = PBXBuildFile; fileRef = 8C82F7922BB6EAB0009AEFD2 /* SemanticVersion.drkdatas */; }; 8C9776082BCECBC3006EDB58 /* Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9776072BCECBC3006EDB58 /* Audio.swift */; }; 8C9776092BCECBC3006EDB58 /* Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9776072BCECBC3006EDB58 /* Audio.swift */; }; - 8CA164852BF12731000065D8 /* SupportsUICore in Frameworks */ = {isa = PBXBuildFile; productRef = 8CA164842BF12731000065D8 /* SupportsUICore */; }; 8CA1BA112BD2AF9E009BCDFB /* PrivateSymbols.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CA1BA102BD2AF9E009BCDFB /* PrivateSymbols.m */; }; 8CA1BA122BD2AF9E009BCDFB /* PrivateSymbols.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CA1BA102BD2AF9E009BCDFB /* PrivateSymbols.m */; }; 8CA370D42B82690700CE0E9E /* Mixpanel in Frameworks */ = {isa = PBXBuildFile; productRef = 8CA370D32B82690700CE0E9E /* Mixpanel */; }; @@ -414,7 +413,6 @@ 8CA7CBF72B77AC8A008E587F /* SDWebImagePDFCoder in Frameworks */, 8C03B6DE2C280BAA000770B4 /* Cepheus in Frameworks */, 8CA7CBF52B77AC8A008E587F /* SDWebImageSVGCoder in Frameworks */, - 8CA164852BF12731000065D8 /* SupportsUICore in Frameworks */, 8CA370D62B82691100CE0E9E /* Mixpanel in Frameworks */, 8CA7CBE72B77AC8A008E587F /* Marquee in Frameworks */, 8CA7CBE92B77AC8A008E587F /* SwiftDate in Frameworks */, @@ -852,7 +850,6 @@ 8CA370D52B82691100CE0E9E /* Mixpanel */, 8CB176A62BB8189300CEC05C /* SDWebImageSwiftUI */, 8CB176AF2BB8421300CEC05C /* DarockKit */, - 8CA164842BF12731000065D8 /* SupportsUICore */, 8C03B6DD2C280BAA000770B4 /* Cepheus */, ); productName = "MeowBili Watch App"; @@ -936,7 +933,6 @@ 8CA370DD2B827AAD00CE0E9E /* XCRemoteSwiftPackageReference "AlertToast" */, 8CB176A32BB8188600CEC05C /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */, 8CB176AC2BB8420A00CEC05C /* XCRemoteSwiftPackageReference "DarockKit" */, - 8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */, 8C03B6DC2C280BAA000770B4 /* XCRemoteSwiftPackageReference "Cepheus" */, ); productRefGroup = B44689CB2B4FC15A002CCEB2 /* Products */; @@ -1942,14 +1938,6 @@ minimumVersion = 1.0.0; }; }; - 8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/Darock-Studio/SupportsUICore"; - requirement = { - branch = main; - kind = branch; - }; - }; 8CA370D22B82690700CE0E9E /* XCRemoteSwiftPackageReference "mixpanel-swift" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/mixpanel/mixpanel-swift"; @@ -2091,11 +2079,6 @@ package = 8C0557DD2B791B84009D9CD0 /* XCRemoteSwiftPackageReference "AZVideoPlayer" */; productName = AZVideoPlayer; }; - 8CA164842BF12731000065D8 /* SupportsUICore */ = { - isa = XCSwiftPackageProductDependency; - package = 8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */; - productName = SupportsUICore; - }; 8CA370D32B82690700CE0E9E /* Mixpanel */ = { isa = XCSwiftPackageProductDependency; package = 8CA370D22B82690700CE0E9E /* XCRemoteSwiftPackageReference "mixpanel-swift" */; diff --git a/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e7aebd413..f8c11ac10 100644 --- a/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "1311c4492e25a9d03c421bf04b1213b17f7c90b7c5de8ba05d6cd5a960ca059e", + "originHash" : "1d6908fce52068cf83a5813eeb0ba93bd037e4d0987a77fcbbb6dcf9448d4c48", "pins" : [ { "identity" : "alamofire", @@ -163,15 +163,6 @@ "version" : "2.3.0" } }, - { - "identity" : "supportsuicore", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Darock-Studio/SupportsUICore", - "state" : { - "branch" : "main", - "revision" : "2460d64cf0419fd2606b08f24558496d8fe8a360" - } - }, { "identity" : "swift_qrcodejs", "kind" : "remoteSourceControl", diff --git a/MeowBili/Errors/FeedbackView.swift b/MeowBili/Errors/FeedbackView.swift index 07af71c3c..e4bb3b469 100644 --- a/MeowBili/Errors/FeedbackView.swift +++ b/MeowBili/Errors/FeedbackView.swift @@ -19,9 +19,6 @@ import SwiftUI import DarockKit import EFQRCode -#if os(watchOS) -import SupportsUICore -#endif #if os(watchOS) struct FeedbackView: View { @@ -52,11 +49,6 @@ struct InAppFeedbackView: View { NavigationLink(destination: { NewFeedbackView() }, label: { Label("新建反馈", systemImage: "exclamationmark.bubble.fill") }) - #if os(watchOS) - NavigationLink(destination: { SUICChatSupportView(projName: "喵哩喵哩") }, label: { - Label("请求在线支持 (Beta)", systemImage: "bubble.left.and.text.bubble.right") - }) - #endif } if feedbackIds.count != 0 { Section { diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh index c5b8e6d63..9ae279299 100755 --- a/ci_scripts/ci_pre_xcodebuild.sh +++ b/ci_scripts/ci_pre_xcodebuild.sh @@ -2,6 +2,8 @@ if [ "$CI_WORKFLOW" = "Public Release" ]; then NEW_TEXT="Darock" +elif [ "$CI_WORKFLOW" = "TF Deploy" ]; then + NEW_TEXT="Linecom" else # 默认值,如果 CI_WORKFLOW 不匹配上述条件 NEW_TEXT="Unknown"