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.

Sign up for GitHub

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

Ios wireguard fix and version bump #78

Merged
merged 3 commits into from
Jul 7, 2022
Merged

Ios wireguard fix and version bump #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aa61bf
Bump version
alexudev Jul 6, 2022
d618af1
fix crash
eugenyorbitsoftcom Jul 1, 2022
f879663
Applied fix from spamming button issue solution, bumped app version, …
alexudev Jul 7, 2022
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
2 changes: 1 addition & 1 deletion client/fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ lane :addToTestFlight do
export_options: {
provisioningProfiles: {
"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.
Expand Down
32 changes: 25 additions & 7 deletions client/fastlane/report.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 classname="fastlane.lanes" name="2: match" time="2.651435">
<testcase classname="fastlane.lanes" name="2: match" time="2.707099">

</testcase>


<testcase classname="fastlane.lanes" name="3: notification" time="0.217503">
<testcase classname="fastlane.lanes" name="3: notification" time="0.226435">

</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 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>

Expand Down
2 changes: 1 addition & 1 deletion client/ios/app/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
2 changes: 1 addition & 1 deletion client/macos/networkextension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSMinimumSystemVersion</key>
Expand Down
4 changes: 1 addition & 3 deletions client/protocols/ios_vpnprotocol.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@

[m_controller disconnect];

dispatch_async(dispatch_get_main_queue(), ^{
emit connectionStateChanged(Disconnected);
});
emit connectionStateChanged(Disconnected);

[m_controller dealloc];
m_controller = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion client/scripts/xcode_patcher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def setup_target_main(shortVersion, fullVersion, platform, networkExtension, con
config.build_settings['ENABLE_BITCODE'] ||= 'NO' 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['PATH'] = '${PATH}:/usr/local/go/bin'
config.build_settings['PATH'] = '${PATH}:/usr/local/go/bin:/usr/local/bin:/opt/homebrew/bin'

groupId = "";
if (platform == 'macos')
Expand Down
4 changes: 2 additions & 2 deletions client/version.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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
# 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 changes: 2 additions & 2 deletions client/versionfull.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# current build 7
!defined(BUILDVERSION, var):BUILDVERSION = 10
# current build 1
!defined(BUILDVERSION, var):BUILDVERSION = 2