Skip to content

Commit

Permalink
Merge branch 'meta-dev' into meta
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrFq1
mrFq1 committed Sep 25, 2023
2 parents 7c8eab8 + f5f42ea commit a853766
Show file tree
Hide file tree
Showing 69 changed files with 915 additions and 603 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: robinraju/[email protected]
with:
repository: 'MetaCubeX/Clash.Meta'
tag: "v1.15.1"
tag: "v1.16.0"
fileName: ".*darwin.*64-v.*.gz"

# releaseId: "62870807"
Expand Down
36 changes: 24 additions & 12 deletions ClashX SwiftUI.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
011946B62A32F64600502077 /* TunModeSettingCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011946B52A32F64500502077 /* TunModeSettingCommand.swift */; };
011946BA2A334C4900502077 /* ClashWebViewContoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011946B92A334C4900502077 /* ClashWebViewContoller.swift */; };
012875E52A2E39CD004FB615 /* ClashX Dashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 012875E42A2E39CD004FB615 /* ClashX Dashboard */; };
013C9F422AC160D200150FCC /* TerminalCleanUpAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013C9F3F2AC160D200150FCC /* TerminalCleanUpAction.swift */; };
013C9F432AC160D200150FCC /* UpdateConfigAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013C9F402AC160D200150FCC /* UpdateConfigAction.swift */; };
013C9F442AC160D200150FCC /* UpdateExternalResourceAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013C9F412AC160D200150FCC /* UpdateExternalResourceAction.swift */; };
0144905C2A8150920056028A /* Combine+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0144905A2A8150920056028A /* Combine+Ext.swift */; };
0144905D2A8150920056028A /* SpeedUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0144905B2A8150920056028A /* SpeedUtils.swift */; };
0144905F2A8153260056028A /* ClashWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0144905E2A8153250056028A /* ClashWindowController.swift */; };
Expand Down Expand Up @@ -63,7 +66,6 @@
495A44D320D267D000888A0A /* LaunchAtLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495A44D220D267D000888A0A /* LaunchAtLogin.swift */; };
495BFB8821919B9800C8779D /* RemoteConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495BFB8721919B9800C8779D /* RemoteConfigManager.swift */; };
4966E9E32118153A00A391FB /* NSUserNotificationCenter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4966E9E22118153A00A391FB /* NSUserNotificationCenter+Extension.swift */; };
4966E9E6211824F300A391FB /* NSImage+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4966E9E5211824F300A391FB /* NSImage+extension.swift */; };
49722FEF211F338B00650A41 /* FileEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49722FEA211F338B00650A41 /* FileEvent.swift */; };
49722FF0211F338B00650A41 /* EventStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49722FEB211F338B00650A41 /* EventStream.swift */; };
49722FF1211F338B00650A41 /* Witness.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49722FEC211F338B00650A41 /* Witness.swift */; };
Expand Down Expand Up @@ -99,7 +101,6 @@
49D176A9235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D176A8235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift */; };
49D176AB23575BB20093DD7B /* ProxyGroupMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D176AA23575BB20093DD7B /* ProxyGroupMenuItemView.swift */; };
49D6A45229AEEC15006487EF /* StatusItemTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D6A45129AEEC15006487EF /* StatusItemTool.swift */; };
49D6A45429AEEC3C006487EF /* NewStatusItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D6A45329AEEC3C006487EF /* NewStatusItemView.swift */; };
49D6A45629AEEC55006487EF /* StatusItemViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49D6A45529AEEC55006487EF /* StatusItemViewProtocol.swift */; };
8A2BBEA727A03ACB0081EBEF /* ProxySetting.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 8A2BBEA627A03ACB0081EBEF /* ProxySetting.sdef */; };
8ACD21BB27A04C7800BC4632 /* ProxySettingCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ACD21BA27A04C7800BC4632 /* ProxySettingCommand.swift */; };
Expand Down Expand Up @@ -163,6 +164,9 @@
/* Begin PBXFileReference section */
011946B52A32F64500502077 /* TunModeSettingCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunModeSettingCommand.swift; sourceTree = "<group>"; };
011946B92A334C4900502077 /* ClashWebViewContoller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClashWebViewContoller.swift; sourceTree = "<group>"; };
013C9F3F2AC160D200150FCC /* TerminalCleanUpAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TerminalCleanUpAction.swift; sourceTree = "<group>"; };
013C9F402AC160D200150FCC /* UpdateConfigAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConfigAction.swift; sourceTree = "<group>"; };
013C9F412AC160D200150FCC /* UpdateExternalResourceAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateExternalResourceAction.swift; sourceTree = "<group>"; };
0144905A2A8150920056028A /* Combine+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Combine+Ext.swift"; sourceTree = "<group>"; };
0144905B2A8150920056028A /* SpeedUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpeedUtils.swift; sourceTree = "<group>"; };
0144905E2A8153250056028A /* ClashWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClashWindowController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -206,7 +210,6 @@
495A44D220D267D000888A0A /* LaunchAtLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchAtLogin.swift; sourceTree = "<group>"; };
495BFB8721919B9800C8779D /* RemoteConfigManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteConfigManager.swift; sourceTree = "<group>"; };
4966E9E22118153A00A391FB /* NSUserNotificationCenter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUserNotificationCenter+Extension.swift"; sourceTree = "<group>"; };
4966E9E5211824F300A391FB /* NSImage+extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+extension.swift"; sourceTree = "<group>"; };
49722FEA211F338B00650A41 /* FileEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileEvent.swift; sourceTree = "<group>"; };
49722FEB211F338B00650A41 /* EventStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventStream.swift; sourceTree = "<group>"; };
49722FEC211F338B00650A41 /* Witness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Witness.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -249,7 +252,6 @@
49D176A8235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyGroupSpeedTestMenuItem.swift; sourceTree = "<group>"; };
49D176AA23575BB20093DD7B /* ProxyGroupMenuItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProxyGroupMenuItemView.swift; sourceTree = "<group>"; };
49D6A45129AEEC15006487EF /* StatusItemTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusItemTool.swift; sourceTree = "<group>"; };
49D6A45329AEEC3C006487EF /* NewStatusItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewStatusItemView.swift; sourceTree = "<group>"; };
49D6A45529AEEC55006487EF /* StatusItemViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusItemViewProtocol.swift; sourceTree = "<group>"; };
49D8276627E9B01700159D93 /* LoginKitWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginKitWrapper.h; sourceTree = "<group>"; };
49D8276727E9B01700159D93 /* LoginKitWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginKitWrapper.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -320,6 +322,16 @@
name = Frameworks;
sourceTree = "<group>";
};
013C9F3E2AC160D200150FCC /* Actions */ = {
isa = PBXGroup;
children = (
013C9F412AC160D200150FCC /* UpdateExternalResourceAction.swift */,
013C9F3F2AC160D200150FCC /* TerminalCleanUpAction.swift */,
013C9F402AC160D200150FCC /* UpdateConfigAction.swift */,
);
path = Actions;
sourceTree = "<group>";
};
4913C82021157CEB00F6B87C /* Macro */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -467,10 +479,10 @@
children = (
498BC2512929CC0A00CA8084 /* Settings */,
49BC061B212931F4005A0FE7 /* AboutViewController.swift */,
01B1CB072A2E1EC10073EA34 /* DashboardManagerSwiftUI.swift */,
011946B92A334C4900502077 /* ClashWebViewContoller.swift */,
499A485322ED707300F6C675 /* RemoteConfigViewController.swift */,
499ADAFE2498FC6D00C488FE /* ExternalControlViewController.swift */,
011946B92A334C4900502077 /* ClashWebViewContoller.swift */,
01B1CB072A2E1EC10073EA34 /* DashboardManagerSwiftUI.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand All @@ -491,10 +503,9 @@
children = (
495A44D220D267D000888A0A /* LaunchAtLogin.swift */,
01C5B88C2A4FD1DB00C4E36A /* Logger.swift */,
4966E9E5211824F300A391FB /* NSImage+extension.swift */,
01EACC772A2F94C7001C584B /* NSView+Layout.swift */,
49B10869216A356D0064FFCE /* String+Extension.swift */,
49ABB748236B0F9E00535CD7 /* UnsafePointer+bridge.swift */,
01EACC772A2F94C7001C584B /* NSView+Layout.swift */,
0144905B2A8150920056028A /* SpeedUtils.swift */,
0144905A2A8150920056028A /* Combine+Ext.swift */,
);
Expand All @@ -507,7 +518,6 @@
495340AF20DE5F7200B0D3FF /* StatusItemView.xib */,
495340B220DE68C300B0D3FF /* StatusItemView.swift */,
49D6A45129AEEC15006487EF /* StatusItemTool.swift */,
49D6A45329AEEC3C006487EF /* NewStatusItemView.swift */,
49D6A45529AEEC55006487EF /* StatusItemViewProtocol.swift */,
);
path = StatusItem;
Expand Down Expand Up @@ -543,6 +553,7 @@
491C24FF21BD558B00AB5D44 /* Extensions */,
492C4866210EE69B004554A0 /* General */,
4931969C21631F2E00A8E6E7 /* Views */,
013C9F3E2AC160D200150FCC /* Actions */,
4989F98520D0AA300001E564 /* ViewControllers */,
49761DA521C9490400AE13EF /* Resources */,
49CF3B3A20CD783A001EBF94 /* Support Files */,
Expand Down Expand Up @@ -754,6 +765,7 @@
0144905C2A8150920056028A /* Combine+Ext.swift in Sources */,
49D6A45229AEEC15006487EF /* StatusItemTool.swift in Sources */,
49CF3B5C20CE8068001EBF94 /* ClashResourceManager.swift in Sources */,
013C9F432AC160D200150FCC /* UpdateConfigAction.swift in Sources */,
4952C3D02117027C004A4FA8 /* ConfigFileManager.swift in Sources */,
49BC061C212931F4005A0FE7 /* AboutViewController.swift in Sources */,
01EACC782A2F94C7001C584B /* NSView+Layout.swift in Sources */,
Expand Down Expand Up @@ -802,18 +814,18 @@
F92D0B2A236C759100575E15 /* NSTextField+Vibrancy.swift in Sources */,
F910AA24240134AF00116E95 /* ProxyGroupMenu.swift in Sources */,
4952C3BF2115C7CA004A4FA8 /* MenuItemFactory.swift in Sources */,
49D6A45429AEEC3C006487EF /* NewStatusItemView.swift in Sources */,
015F1E92288E60D30052B20A /* MetaTask.swift in Sources */,
013C9F422AC160D200150FCC /* TerminalCleanUpAction.swift in Sources */,
F977FAAC2366790500C17F1F /* AutoUpgardeManager.swift in Sources */,
499A485822ED715200F6C675 /* RemoteConfigModel.swift in Sources */,
49D176AB23575BB20093DD7B /* ProxyGroupMenuItemView.swift in Sources */,
49B4575D244F4A2A00463C39 /* PrivilegedHelperManager.swift in Sources */,
49B4575F244FD4D100463C39 /* PrivilegedHelperManager+Legacy.swift in Sources */,
013C9F442AC160D200150FCC /* UpdateExternalResourceAction.swift in Sources */,
4966E9E32118153A00A391FB /* NSUserNotificationCenter+Extension.swift in Sources */,
F9E754D2239CC28D00CEE7CC /* NSAlert+Extension.swift in Sources */,
49D176A9235614340093DD7B /* ProxyGroupSpeedTestMenuItem.swift in Sources */,
F976275C23634DF8000EDEFE /* LoginServiceKit.swift in Sources */,
4966E9E6211824F300A391FB /* NSImage+extension.swift in Sources */,
011946B62A32F64600502077 /* TunModeSettingCommand.swift in Sources */,
01C5B88D2A4FD1DB00C4E36A /* Logger.swift in Sources */,
F92D0B2E236D35C000575E15 /* ProxyItemView.swift in Sources */,
Expand Down Expand Up @@ -1286,7 +1298,7 @@
repositoryURL = "https://github.com/mxcl/PromiseKit";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.0.0;
minimumVersion = 8.0.0;
};
};
01EACC6E2A2F9408001C584B /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */ = {
Expand Down
6 changes: 3 additions & 3 deletions ClashX SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"location" : "https://github.com/mrFq1/ClashX-Dashboard",
"state" : {
"branch" : "dev",
"revision" : "4aff8f8d1d05b4dbd58e46ca7322b7662bebf624"
"revision" : "272999024e836c5b006b0f3869fa4a1f5d27286b"
}
},
{
Expand Down Expand Up @@ -77,8 +77,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/PromiseKit",
"state" : {
"revision" : "8a98e31a47854d3180882c8068cc4d9381bf382d",
"version" : "6.22.1"
"revision" : "cb70b070cde06837cd10a1febdf6105c1a3bb348",
"version" : "8.1.1"
}
},
{
Expand Down
Loading

0 comments on commit a853766

Please sign in to comment.