From aa1b561bc08fbef144ad92647ad47020559618aa Mon Sep 17 00:00:00 2001 From: Alex Kh Date: Thu, 30 Jun 2022 21:10:34 +0400 Subject: [PATCH] Latest updates before starting anew --- client/fastlane/Fastfile | 2 +- client/fastlane/report.xml | 32 ++++++------------------ client/ios/app/Info.plist | 2 +- client/macos/networkextension/Info.plist | 2 +- client/scripts/xcode_patcher.rb | 16 ++++++------ client/versionfull.pri | 2 +- 6 files changed, 19 insertions(+), 37 deletions(-) diff --git a/client/fastlane/Fastfile b/client/fastlane/Fastfile index 3027dbdcc..fda7dfefa 100644 --- a/client/fastlane/Fastfile +++ b/client/fastlane/Fastfile @@ -64,7 +64,7 @@ lane :addToTestFlight do export_options: { provisioningProfiles: { "org.amnezia.AmneziaVPN"=>"match AppStore org.amnezia.AmneziaVPN", - "org.amnezia.AmneziaVPN.network-extension"=>"match development AmneziaVPN networkextension", + "org.amnezia.AmneziaVPN.network-extension"=>"match AppStore AmneziaVPN networkextension", } }, output_directory: "fastlane/build/", # Destination directory. Defaults to current directory. diff --git a/client/fastlane/report.xml b/client/fastlane/report.xml index 2cd9cea91..65f800695 100644 --- a/client/fastlane/report.xml +++ b/client/fastlane/report.xml @@ -5,52 +5,34 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/client/ios/app/Info.plist b/client/ios/app/Info.plist index cfd8942d6..f7a2748cb 100644 --- a/client/ios/app/Info.plist +++ b/client/ios/app/Info.plist @@ -25,7 +25,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 9 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/client/macos/networkextension/Info.plist b/client/macos/networkextension/Info.plist index 6e0630458..96d824590 100644 --- a/client/macos/networkextension/Info.plist +++ b/client/macos/networkextension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 9 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption LSMinimumSystemVersion diff --git a/client/scripts/xcode_patcher.rb b/client/scripts/xcode_patcher.rb index 59184f581..5dccb5541 100644 --- a/client/scripts/xcode_patcher.rb +++ b/client/scripts/xcode_patcher.rb @@ -71,10 +71,10 @@ class XCodeprojPatcher "$(inherited)", "$(PROJECT_DIR)/3rd", "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos", -# "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos", + "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos", # "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos", -# "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", -# "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", + "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", + "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", # "${PROJECT_DIR}/3rd/CocoaLumberjack/build/Release-iphoneos", ] @@ -271,7 +271,7 @@ class XCodeprojPatcher @target_extension.build_configurations.each do |config| config.base_configuration_reference = @configFile - config.build_settings['LD_RUNPATH_SEARCH_PATHS'] ||= '"$(inherited) @executable_path/../Frameworks"' + config.build_settings['LD_RUNPATH_SEARCH_PATHS'] ||= '"$(inherited) @executable_path/../Frameworks @executable_path/../../Frameworks"' config.build_settings['SWIFT_VERSION'] ||= '5.0' config.build_settings['CLANG_ENABLE_MODULES'] ||= 'YES' config.build_settings['SWIFT_OBJC_BRIDGING_HEADER'] ||= 'macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h' @@ -282,11 +282,11 @@ class XCodeprojPatcher "$(inherited)", "$(PROJECT_DIR)/3rd", "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos", -# "$(PROJECT_DIR)/3rd/libleaf/lib", -# "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos", + "$(PROJECT_DIR)/3rd/libleaf/lib", + "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos", # "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos", -# "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", -# "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", + "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", + "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", # "${PROJECT_DIR}/3rd/CocoaLumberjack/build/Release-iphoneos", ] # config.build_settings['LIBRARY_SEARCH_PATHS'] = [config.build_settings['LIBRARY_SEARCH_PATHS'], "$(PROJECT_DIR)/3rd/libleaf/lib"] diff --git a/client/versionfull.pri b/client/versionfull.pri index 45d9811f6..eb9fb50ab 100644 --- a/client/versionfull.pri +++ b/client/versionfull.pri @@ -1,2 +1,2 @@ # current build 7 -!defined(BUILDVERSION, var):BUILDVERSION = 9 \ No newline at end of file +!defined(BUILDVERSION, var):BUILDVERSION = 10 \ No newline at end of file