KM-4542: Update dependencies (#160)

* KM-4542: Build a development build with staging capabilities * KM-4542: Update app version and dependencies
pia-foss · Jul 5, 2024 · fa37b0d · fa37b0d
1 parent 44de0d3
commit fa37b0d
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 14 deletions.
diff --git a/.github/workflows/development_build.yml b/.github/workflows/development_build.yml
@@ -48,6 +48,9 @@ jobs:
 
     - name: Archive development build
       run: bundle exec fastlane development_build
+
+    - name: Archive staging development build 
+      run: bundle exec fastlane staging_build
 
     - name: Upload development ipa file
       uses: actions/upload-artifact@v4

diff --git a/PIA VPN-tvOSTests/Signup/Mocks/SignupUseCaseMock.swift b/PIA VPN-tvOSTests/Signup/Mocks/SignupUseCaseMock.swift
@@ -10,7 +10,7 @@ import Foundation
 @testable import PIA_VPN_tvOS
 import PIALibrary
 
-class SignupUseCaseMock: SignupUseCaseType {
+class SignupUseCaseMock: PIA_VPN_tvOS.SignupUseCaseType {
     private let result: Result<PIA_VPN_tvOS.UserAccount, Error>
 
     init(result: Result<PIA_VPN_tvOS.UserAccount, Error>) {

diff --git a/PIA VPN.xcodeproj/project.pbxproj b/PIA VPN.xcodeproj/project.pbxproj
@@ -6369,7 +6369,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.Tunnel";
 				PRODUCT_NAME = "PIA VPN Tunnel";
@@ -6404,7 +6404,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.Tunnel";
 				PRODUCT_NAME = "PIA VPN Tunnel";
@@ -6446,7 +6446,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN";
 				PRODUCT_MODULE_NAME = PIA_VPN_dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6490,7 +6490,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN";
 				PRODUCT_MODULE_NAME = PIA_VPN_dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6597,7 +6597,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.AdBlocker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6635,7 +6635,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.AdBlocker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -6785,7 +6785,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.privateinternetaccess.ios.PIA-VPN";
@@ -6826,7 +6826,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.privateinternetaccess.ios.PIA-VPN";
@@ -7000,7 +7000,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.PIAWidget";
@@ -7043,7 +7043,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.PIAWidget";
@@ -7080,7 +7080,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.WG-Tunnel";
@@ -7120,7 +7120,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.24.3;
+				MARKETING_VERSION = 3.25.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.privateinternetaccess.ios.PIA-VPN.WG-Tunnel";
@@ -7771,7 +7771,7 @@
 			repositoryURL = "https://github.com/pia-foss/mobile-ios-library.git";
 			requirement = {
 				kind = revision;
-				revision = 41c6477ae8f3a23a3d7d2296451e9df3b0f55463;
+				revision = 5ee445af127e3ed3dd2474687094cd49d073fdf3;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -214,6 +214,37 @@ platform :ios do
 
   end
 
+  desc "This line is for creating a developer build that connects with staging"
+  lane :staging_build do
+
+    current_branch = git_branch()
+    commit_hash = last_git_commit()
+    short_hash = commit_hash[:abbreviated_commit_hash]
+    archive_path = "PIA_VPN_dev_iOS.#{current_branch}_#{short_hash}"
+    archive_zip_name = "#{archive_path}.zip"
+
+    build_app(scheme: "PIA VPN dev",
+      export_method: "development",
+      clean: true,
+      configuration: "Debug",
+      build_path: "build/#{archive_path}",
+      output_name: "#{archive_path}.ipa",
+      export_options: {
+        provisioningProfiles: { 
+          "com.privateinternetaccess.ios.PIA-VPN" => "match Development com.privateinternetaccess.ios.PIA-VPN",
+          "com.privateinternetaccess.ios.PIA-VPN.Tunnel" => "match Development com.privateinternetaccess.ios.PIA-VPN.Tunnel",
+          "com.privateinternetaccess.ios.PIA-VPN.WG-Tunnel" => "match Development com.privateinternetaccess.ios.PIA-VPN.WG-Tunnel",
+          "com.privateinternetaccess.ios.PIA-VPN.PIAWidget" => "match Development com.privateinternetaccess.ios.PIA-VPN.PIAWidget",
+          "com.privateinternetaccess.ios.PIA-VPN.AdBlocker" => "match Development com.privateinternetaccess.ios.PIA-VPN.AdBlocker"
+        }
+      }
+    )
+
+    zip(output_path: archive_zip_name, path: "#{archive_path}.ipa")
+    sh "mv ../#{archive_zip_name} ../artifacts/#{archive_zip_name}"
+
+  end
+
 
   desc "Increase build number for TestFlight"
   private_lane :increment_build_number_testflight do