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

Merge pull request #78 from amnezia-vpn/ios-wireguard

Browse source 
Ios wireguard fix and version bump
This commit is contained in:
pokamest 2022-07-07 16:31:19 +03:00 • committed by GitHub
commit a8067bee36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 18 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 AppStore AmneziaVPN networkextension", "org.amnezia.AmneziaVPN.network-extension"=>"match AppStore org.amnezia.AmneziaVPN.network-extension",
} }
}, },
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,34 +5,52 @@
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.000244"> <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000215">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000167"> <testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000162">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: match" time="2.651435"> <testcase classname="fastlane.lanes" name="2: match" time="2.707099">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="3: notification" time="0.217503"> <testcase classname="fastlane.lanes" name="3: notification" time="0.226435">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000624"> <testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000648">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="5: build_app" time="222.74195"> <testcase classname="fastlane.lanes" name="5: build_app" time="259.546685">
<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>
<testcase classname="fastlane.lanes" name="6: testflight" time="84.84052">
</testcase>
<testcase classname="fastlane.lanes" name="7: get_version_number" time="0.114899">
</testcase>
<testcase classname="fastlane.lanes" name="8: get_build_number" time="1.332216">
</testcase>
<testcase classname="fastlane.lanes" name="9: increment_build_number" time="2.325473">
</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>$(CURRENT_PROJECT_VERSION)</string> <string>2</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>$(CURRENT_PROJECT_VERSION)</string> <string>2</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

4
client/protocols/ios_vpnprotocol.mm
View file

@ -149,9 +149,7 @@ void IOSVpnProtocol::stop()
[m_controller disconnect]; [m_controller disconnect];
dispatch_async(dispatch_get_main_queue(), ^{ emit connectionStateChanged(Disconnected);
emit connectionStateChanged(Disconnected);
});
[m_controller dealloc]; [m_controller dealloc];
m_controller = nullptr; m_controller = nullptr;

2
client/scripts/xcode_patcher.rb
View file

@ -104,7 +104,7 @@ class XCodeprojPatcher
config.build_settings['ENABLE_BITCODE'] ||= 'NO' if platform == 'ios' config.build_settings['ENABLE_BITCODE'] ||= 'NO' if platform == 'ios'
config.build_settings['SDKROOT'] = 'iphoneos' if platform == 'ios' config.build_settings['SDKROOT'] = 'iphoneos' if platform == 'ios'
config.build_settings['SWIFT_PRECOMPILE_BRIDGING_HEADER'] = 'NO' if platform == 'ios' config.build_settings['SWIFT_PRECOMPILE_BRIDGING_HEADER'] = 'NO' if platform == 'ios'
config.build_settings['PATH'] = '${PATH}:/usr/local/go/bin' config.build_settings['PATH'] = '${PATH}:/usr/local/go/bin:/usr/local/bin:/opt/homebrew/bin'
groupId = ""; groupId = "";
if (platform == 'macos') if (platform == 'macos')

4
client/version.pri
View file

@ -1,6 +1,6 @@
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# current version 2.0.8 # current version 2.0.10
!defined(VERSION, var):VERSION = 2.0.8 !defined(VERSION, var):VERSION = 2.0.10

4
client/versionfull.pri
View file

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