Merge branch 'meta-dev' into meta

MetaCubeX · Jan 2, 2024 · 645d898 · 645d898
2 parents 727c4e7 + 79c0207
commit 645d898
Show file tree

Hide file tree

Showing 9 changed files with 238 additions and 237 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,12 +7,9 @@ on:
     inputs:
       logLevel:
 
-env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
-
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
       with:
@@ -23,8 +20,8 @@ jobs:
     - name: download meta core
       uses: robinraju/[email protected]
       with:
-        repository: 'MetaCubeX/Clash.Meta'
-        tag: "v1.16.0"
+        repository: 'MetaCubeX/mihomo'
+        tag: "v1.17.0"
         fileName: ".*darwin.*64-v.*.gz"
 
         # releaseId: "62870807"

diff --git a/ClashX/AppDelegate.swift b/ClashX/AppDelegate.swift
@@ -579,13 +579,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 		let outs = out
 			.split(separator: "\n")
 			.first {
-				$0.starts(with: "Clash Meta")
+				$0.starts(with: "Clash Meta") || $0.starts(with: "Mihomo Meta")
 			}?.split(separator: " ")
 			.map(String.init)
 
         guard let outs,
 			  outs.count == 13,
-              outs[0] == "Clash",
+              (outs[0] == "Clash" || outs[0] == "Mihomo"),
               outs[1] == "Meta",
               outs[3] == "darwin" else {
             return nil

diff --git a/ClashX/Base.lproj/Main.storyboard b/ClashX/Base.lproj/Main.storyboard
diff --git a/ClashX/Basic/Logger.swift b/ClashX/Basic/Logger.swift
@@ -42,7 +42,8 @@ class Logger {
     }
 
     static func log(_ msg: String, level: ClashLogLevel = .info, file: String = #file, function: String = #function) {
-        shared.logToFile(msg: "[\(level.rawValue)] \(file) \(function) \(msg)", level: level)
+		let fileName = URL(fileURLWithPath: file).lastPathComponent
+        shared.logToFile(msg: "[\(level.rawValue)] \(fileName) \(function) \(msg)", level: level)
     }
 
     func logFilePath() -> String {

diff --git a/ClashX/ClashX Meta SwiftUI-Info.plist b/ClashX/ClashX Meta SwiftUI-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>ClashX use location info to detect your current WiFi network SSID name and provide the auto suspend services.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>ClashX use location info to detect your current WiFi network SSID name and provide the auto suspend services.</string>
 	<key>BETA</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>

diff --git a/ClashX/General/AlphaMetaDownloader.swift b/ClashX/General/AlphaMetaDownloader.swift
@@ -79,12 +79,13 @@ class AlphaMetaDownloader: NSObject {
 	static func alphaAsset() -> Promise<ReleasesResp.Asset> {
 		Promise { resolver in
 			let assetName = assetName()
-			AF.request("https://api.github.com/repos/MetaCubeX/Clash.Meta/releases/tags/Prerelease-Alpha").responseDecodable(of: ReleasesResp.self) {
+			AF.request("https://api.github.com/repos/MetaCubeX/mihomo/releases/tags/Prerelease-Alpha").responseDecodable(of: ReleasesResp.self) {
 				guard let assets = $0.value?.assets,
 					  let assetName,
 					  let asset = assets.first(where: {
 						  $0.name.contains(assetName) &&
 						  !$0.name.contains("cgo") &&
+						  !$0.name.contains("go120") &&
 						  $0.state == "uploaded" &&
 						  $0.contentType == "application/gzip"
 					  }) else {

diff --git a/ProxyConfigHelper/Helper-Info.plist b/ProxyConfigHelper/Helper-Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleName</key>
 	<string>com.metacubex.ClashX.ProxyConfigHelper</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7</string>
+	<string>1.8</string>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>18</string>
 	<key>SMAuthorizedClients</key>
 	<array>
 		<string>anchor apple generic and identifier &quot;com.metacubex.ClashX.ProxyConfigHelper&quot; and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = MEWHFZ92DY)</string>