AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Latest updates before starting anew

Browse source
This commit is contained in:
Alex Kh 2022-06-30 21:10:34 +04:00
parent 6674b7890c
commit aa1b561bc0
6 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/fastlane/Fastfile
View file

@ -64,7 +64,7 @@ lane :addToTestFlight do
export_options: { export_options: {
provisioningProfiles: { provisioningProfiles: {
"org.amnezia.AmneziaVPN"=>"match AppStore org.amnezia.AmneziaVPN", "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. output_directory: "fastlane/build/", # Destination directory. Defaults to current directory.

32
client/fastlane/report.xml
View file

@ -5,52 +5,34 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000214"> <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000244">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000144"> <testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000167">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: match" time="3.322423"> <testcase classname="fastlane.lanes" name="2: match" time="2.651435">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="3: notification" time="0.236243"> <testcase classname="fastlane.lanes" name="3: notification" time="0.217503">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000632"> <testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000624">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="5: build_app" time="231.210464"> <testcase classname="fastlane.lanes" name="5: build_app" time="222.74195">
</testcase> <failure message="/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/actions/actions_helper.rb:67:in `execute_action'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:229:in `chdir'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:229:in `execute_action'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing'&#10;Fastfile:57:in `block in parsing_binding'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/lane.rb:33:in `call'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:49:in `block in execute'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:45:in `chdir'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/runner.rb:45:in `execute'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/commands_generator.rb:110:in `block (2 levels) in run'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/commander-4.6.0/lib/commander/command.rb:187:in `call'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/commander-4.6.0/lib/commander/command.rb:157:in `run'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/commander-4.6.0/lib/commander/runner.rb:444:in `run_active_command'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in `run!'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/commander-4.6.0/lib/commander/delegates.rb:18:in `run!'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/commands_generator.rb:354:in `run'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/commands_generator.rb:43:in `start'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in `take_off'&#10;/Users/sanchez/.rbenv/versions/2.7.4/lib/ruby/gems/2.7.0/gems/fastlane-2.206.2/bin/fastlane:23:in `&lt;top (required)&gt;'&#10;/Users/sanchez/.rbenv/versions/2.7.4/bin/fastlane:23:in `load'&#10;/Users/sanchez/.rbenv/versions/2.7.4/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Error building the application - see the log above" />
<testcase classname="fastlane.lanes" name="6: testflight" time="68.731283">
</testcase>
<testcase classname="fastlane.lanes" name="7: get_version_number" time="0.121762">
</testcase>
<testcase classname="fastlane.lanes" name="8: get_build_number" time="1.022995">
</testcase>
<testcase classname="fastlane.lanes" name="9: increment_build_number" time="2.417907">
</testcase> </testcase>

2
client/ios/app/Info.plist
View file

@ -25,7 +25,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>9</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>

2
client/macos/networkextension/Info.plist
View file

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>9</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

16
client/scripts/xcode_patcher.rb
View file

@ -71,10 +71,10 @@ class XCodeprojPatcher
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/3rd", "$(PROJECT_DIR)/3rd",
"$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos", "$(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/PacketProcessor/build/Release-iphoneos",
# "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios",
# "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos",
# "${PROJECT_DIR}/3rd/CocoaLumberjack/build/Release-iphoneos", # "${PROJECT_DIR}/3rd/CocoaLumberjack/build/Release-iphoneos",
] ]
@ -271,7 +271,7 @@ class XCodeprojPatcher
@target_extension.build_configurations.each do |config| @target_extension.build_configurations.each do |config|
config.base_configuration_reference = @configFile 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['SWIFT_VERSION'] ||= '5.0'
config.build_settings['CLANG_ENABLE_MODULES'] ||= 'YES' config.build_settings['CLANG_ENABLE_MODULES'] ||= 'YES'
config.build_settings['SWIFT_OBJC_BRIDGING_HEADER'] ||= 'macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h' config.build_settings['SWIFT_OBJC_BRIDGING_HEADER'] ||= 'macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h'
@ -282,11 +282,11 @@ class XCodeprojPatcher
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/3rd", "$(PROJECT_DIR)/3rd",
"$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos", "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos",
# "$(PROJECT_DIR)/3rd/libleaf/lib", "$(PROJECT_DIR)/3rd/libleaf/lib",
# "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos", "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos",
# "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos", # "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos",
# "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios", "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios",
# "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos", "${PROJECT_DIR}/3rd/CocoaAsyncSocket/build/Release-iphoneos",
# "${PROJECT_DIR}/3rd/CocoaLumberjack/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"] # config.build_settings['LIBRARY_SEARCH_PATHS'] = [config.build_settings['LIBRARY_SEARCH_PATHS'], "$(PROJECT_DIR)/3rd/libleaf/lib"]

2
client/versionfull.pri
View file

@ -1,2 +1,2 @@
# current build 7 # current build 7
!defined(BUILDVERSION, var):BUILDVERSION = 9 !defined(BUILDVERSION, var):BUILDVERSION = 10