From ea9b2e3143784697d4f02134936acc69bc6e8021 Mon Sep 17 00:00:00 2001
From: Corby Ziesman <cziesman@connected.io>
Date: Tue, 5 Nov 2019 13:36:05 -0500
Subject: [PATCH] Fix build and update WireGuard submodule

---
 Cartfile.resolved                                  | 2 +-
 FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj | 4 ++++
 WireGuard                                          | 2 +-
 WireGuardTunnel/Info.plist                         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cartfile.resolved b/Cartfile.resolved
index 288cbdc0..749a7661 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,4 @@
 github "Quick/Nimble" "v8.0.4"
 github "Quick/Quick" "v2.2.0"
 github "ReactiveX/RxSwift" "5.0.1"
-github "airbnb/lottie-ios" "76880a03b08db47f620884af399cb50e01fc540c"
+github "airbnb/lottie-ios" "0004eaa039c37f0c0858a2bc398544d8adee586c"
diff --git a/FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj b/FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj
index 8e3bb459..aa5d100c 100644
--- a/FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj
+++ b/FirefoxPrivateNetworkVPN.xcodeproj/project.pbxproj
@@ -230,6 +230,7 @@
 		F420F4192368840A00CD48BF /* VPNToggleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNToggleView.swift; sourceTree = "<group>"; };
 		F420F41A2368840A00CD48BF /* VPNToggleView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VPNToggleView.xib; sourceTree = "<group>"; };
 		F420F41B2368840A00CD48BF /* CurrentVPNSelectorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CurrentVPNSelectorView.xib; sourceTree = "<group>"; };
+		F423046F2371F7CF00572A93 /* WireGuardGoBridge.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WireGuardGoBridge.xcconfig; sourceTree = "<group>"; };
 		F42A23042347D22100763B0D /* DependencyProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DependencyProviding.swift; sourceTree = "<group>"; };
 		F42A23062347D37F00763B0D /* AccountManaging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountManaging.swift; sourceTree = "<group>"; };
 		F43DFC05234BB32C003EA64A /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
@@ -408,6 +409,7 @@
 				6FF4AC452120B9E0002C96EB /* Frameworks */,
 				6FF4AC15211EC46F002C96EB /* Products */,
 				F4AED107235F450D00F80ABF /* WireGuard */,
+				F423046F2371F7CF00572A93 /* WireGuardGoBridge.xcconfig */,
 				F41CCA32237128F10018DC43 /* WireGuardTunnel */,
 			);
 			sourceTree = "<group>";
@@ -1370,6 +1372,7 @@
 		};
 		6FDEF7DE21846BC100D8FBF6 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F423046F2371F7CF00572A93 /* WireGuardGoBridge.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				GO_PATH = "$(HOME)/go";
@@ -1380,6 +1383,7 @@
 		};
 		6FDEF7DF21846BC100D8FBF6 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = F423046F2371F7CF00572A93 /* WireGuardGoBridge.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				GO_PATH = "$(HOME)/go";
diff --git a/WireGuard b/WireGuard
index 877e9fce..b69d98e1 160000
--- a/WireGuard
+++ b/WireGuard
@@ -1 +1 @@
-Subproject commit 877e9fce90103315bc0695ba1a4d2a7696469241
+Subproject commit b69d98e11dcf7cadc551d7e213d3e9ce1a3b3d74
diff --git a/WireGuardTunnel/Info.plist b/WireGuardTunnel/Info.plist
index 36077c5d..501f369a 100644
--- a/WireGuardTunnel/Info.plist
+++ b/WireGuardTunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(VERSION_ID)</string>
+	<string>1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>