Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zy #1407

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Zy #1407

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,21 @@
9B9F13851E8A282C00DE4794 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1250;
LastUpgradeCheck = 1320;
ORGANIZATIONNAME = qiuyuzhou;
TargetAttributes = {
9B9F138C1E8A282C00DE4794 = {
CreatedOnToolsVersion = 8.2.1;
ProvisioningStyle = Manual;
DevelopmentTeam = K34Z59STMC;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 9B9F13881E8A282C00DE4794 /* Build configuration list for PBXProject "LaunchHelper" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -272,10 +272,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = K34Z59STMC;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = LaunchHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
Expand All @@ -290,10 +291,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = K34Z59STMC;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = LaunchHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
Expand Down
15 changes: 8 additions & 7 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :macos, '10.12'
#platform :macos, '10.12'
platform :macos, '10.15'

target 'ShadowsocksX-NG' do
# Comment this line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

# Pods for ShadowsocksX-NG
pod 'Alamofire', '~> 5.4.3'
pod "GCDWebServer", "~> 3.0"
pod 'MASShortcut', '~> 2'
pod 'Alamofire'#, '~> 5.4.3'
pod "GCDWebServer"#, "~> 3.0"
pod 'MASShortcut'#, '~> 2'

# https://github.com/ReactiveX/RxSwift/blob/master/Documentation/GettingStarted.md
pod 'RxSwift', '~> 6.2.0'
pod 'RxCocoa', '~> 6.2.0'
pod 'RxSwift'#, '~> 6.2.0'
pod 'RxCocoa'#, '~> 6.2.0'

target 'ShadowsocksX-NGTests' do
inherit! :search_paths
Expand All @@ -23,5 +24,5 @@ target 'ShadowsocksX-NG' do
end

target 'proxy_conf_helper' do
pod 'BRLOptionParser', '~> 0.3.1'
pod 'BRLOptionParser'#, '~> 0.3.1'
end
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Alamofire (5.4.3)
- Alamofire (5.4.4)
- BRLOptionParser (0.3.1)
- GCDWebServer (3.5.4):
- GCDWebServer/Core (= 3.5.4)
Expand Down Expand Up @@ -31,14 +31,14 @@ SPEC REPOS:
- RxSwift

SPEC CHECKSUMS:
Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9
Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
BRLOptionParser: a03256a8ff003ca1f5376c55f55f210e085a3958
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f

PODFILE CHECKSUM: 5e6ee339e4466d456309238c104e8625cd1e3e41
PODFILE CHECKSUM: 75c299eebbf64f166cffb1e7b29c582f4251c7da

COCOAPODS: 1.10.1
COCOAPODS: 1.11.2
2 changes: 1 addition & 1 deletion Pods/Alamofire/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 54 additions & 33 deletions Pods/Alamofire/README.md

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions Pods/Alamofire/Source/AFError.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion Pods/Alamofire/Source/Alamofire.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions Pods/Alamofire/Source/AuthenticationInterceptor.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 20 additions & 2 deletions Pods/Alamofire/Source/CachedResponseHandler.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading