Skip to content

Commit b132335

Browse files
buggmagnetbuggmagnet
committed
Unbork the build for UITests
1 parent 79437c6 commit b132335

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

‎ios/MullvadVPN.xcodeproj/project.pbxproj

+19-5
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@
587587
850201DD2B503D8C00EF8C96 /* SelectLocationPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201DC2B503D8C00EF8C96 /* SelectLocationPage.swift */; };
588588
850201DF2B5040A500EF8C96 /* TunnelControlPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201DE2B5040A500EF8C96 /* TunnelControlPage.swift */; };
589589
850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850201E22B51A93C00EF8C96 /* SettingsPage.swift */; };
590-
8518F6382B60157E009EB113 /* LoggedInWithoutTimeUITestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8518F6372B60157E009EB113 /* LoggedInWithoutTimeUITestCase.swift */; };
591590
852969282B4D9C1F007EAD4C /* AccountTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969272B4D9C1F007EAD4C /* AccountTests.swift */; };
592591
852969332B4E9232007EAD4C /* Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969322B4E9232007EAD4C /* Page.swift */; };
593592
852969352B4E9270007EAD4C /* LoginPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 852969342B4E9270007EAD4C /* LoginPage.swift */; };
@@ -763,6 +762,9 @@
763762
A9C342C32ACC3EE90045F00E /* RelayCacheTracker+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C342C22ACC3EE90045F00E /* RelayCacheTracker+Stubs.swift */; };
764763
A9C342C52ACC42130045F00E /* ServerRelaysResponse+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C342C42ACC42130045F00E /* ServerRelaysResponse+Stubs.swift */; };
765764
A9D99B9A2A1F7C3200DE27D3 /* RESTTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06FAE67D28F83CA50033DD93 /* RESTTransport.swift */; };
765+
A9DF789B2B7D1DF10094E4AD /* mullvad-api.h in Headers */ = {isa = PBXBuildFile; fileRef = 01EF6F2D2B6A51B100125696 /* mullvad-api.h */; settings = {ATTRIBUTES = (Private, ); }; };
766+
A9DF789C2B7D1E410094E4AD /* BridgingHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 01EF6F352B6A5AEF00125696 /* BridgingHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
767+
A9DF789D2B7D1E8B0094E4AD /* LoggedInWithTimeUITestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 859089692B61763B003AF5F5 /* LoggedInWithTimeUITestCase.swift */; };
766768
A9E031782ACB09930095D843 /* UIApplication+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E031762ACB08950095D843 /* UIApplication+Extensions.swift */; };
767769
A9E0317A2ACB0AE70095D843 /* UIApplication+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E031792ACB0AE70095D843 /* UIApplication+Stubs.swift */; };
768770
A9E0317C2ACBFC7E0095D843 /* TunnelStore+Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E0317B2ACBFC7E0095D843 /* TunnelStore+Stubs.swift */; };
@@ -1216,7 +1218,7 @@
12161218

12171219
/* Begin PBXFileReference section */
12181220
01EF6F292B6A473900125696 /* MullvadApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MullvadApi.swift; sourceTree = "<group>"; };
1219-
01EF6F2D2B6A51B100125696 /* mullvad-api.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "mullvad-api.h"; sourceTree = "<group>"; };
1221+
01EF6F2D2B6A51B100125696 /* mullvad-api.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "mullvad-api.h"; path = "../../mullvad-api/include/mullvad-api.h"; sourceTree = "<group>"; };
12201222
01EF6F2F2B6A588300125696 /* aarch64-apple-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "aarch64-apple-ios"; path = "../target/aarch64-apple-ios"; sourceTree = "<group>"; };
12211223
01EF6F312B6A58F000125696 /* debug */ = {isa = PBXFileReference; lastKnownFileType = folder; name = debug; path = "../target/aarch64-apple-ios/debug"; sourceTree = "<group>"; };
12221224
01EF6F332B6A590700125696 /* libmullvad_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmullvad_api.a; path = "../target/aarch64-apple-ios/debug/libmullvad_api.a"; sourceTree = "<group>"; };
@@ -3668,6 +3670,8 @@
36683670
isa = PBXHeadersBuildPhase;
36693671
buildActionMask = 2147483647;
36703672
files = (
3673+
A9DF789C2B7D1E410094E4AD /* BridgingHeader.h in Headers */,
3674+
A9DF789B2B7D1DF10094E4AD /* mullvad-api.h in Headers */,
36713675
);
36723676
runOnlyForDeploymentPostprocessing = 0;
36733677
};
@@ -5374,6 +5378,7 @@
53745378
isa = PBXSourcesBuildPhase;
53755379
buildActionMask = 2147483647;
53765380
files = (
5381+
A9DF789D2B7D1E8B0094E4AD /* LoggedInWithTimeUITestCase.swift in Sources */,
53775382
85D2B0B12B6BD32400DF9DA7 /* BaseUITestCase.swift in Sources */,
53785383
8529693C2B4F0257007EAD4C /* Alert.swift in Sources */,
53795384
850201DD2B503D8C00EF8C96 /* SelectLocationPage.swift in Sources */,
@@ -5386,7 +5391,6 @@
53865391
85557B202B5FBBD700795FE1 /* AccountPage.swift in Sources */,
53875392
852969352B4E9270007EAD4C /* LoginPage.swift in Sources */,
53885393
850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */,
5389-
8518F6382B60157E009EB113 /* LoggedInWithoutTimeUITestCase.swift in Sources */,
53905394
85557B102B59215F00795FE1 /* FirewallRule.swift in Sources */,
53915395
850201E32B51A93C00EF8C96 /* SettingsPage.swift in Sources */,
53925396
85557B0E2B591B2600795FE1 /* FirewallAPIClient.swift in Sources */,
@@ -6754,7 +6758,9 @@
67546758
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../mullvad-api/include";
67556759
INFOPLIST_FILE = MullvadVPNUITests/Info.plist;
67566760
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
6757-
"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/debug";
6761+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/debug";
6762+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios-sim/debug";
6763+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = "$(PROJECT_DIR)/../target/x86_64-apple-ios/debug";
67586764
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
67596765
MARKETING_VERSION = 1.0;
67606766
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_IDENTIFIER).MullvadVPNUITests";
@@ -6782,7 +6788,9 @@
67826788
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../mullvad-api/include";
67836789
INFOPLIST_FILE = MullvadVPNUITests/Info.plist;
67846790
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
6785-
"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/release";
6791+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/release";
6792+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios-sim/release";
6793+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = "$(PROJECT_DIR)/../target/x86_64-apple-ios/release";
67866794
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
67876795
MARKETING_VERSION = 1.0;
67886796
PRODUCT_BUNDLE_IDENTIFIER = "$(APPLICATION_IDENTIFIER).MullvadVPNUITests";
@@ -7373,6 +7381,9 @@
73737381
isa = XCBuildConfiguration;
73747382
buildSettings = {
73757383
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../mullvad-api/include";
7384+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/debug";
7385+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios-sim/debug";
7386+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = "$(PROJECT_DIR)/../target/x86_64-apple-ios/debug";
73767387
PRODUCT_NAME = MullvadVPNUITests;
73777388
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/MullvadVPNUITests/BridgingHeader.h";
73787389
};
@@ -7382,6 +7393,9 @@
73827393
isa = XCBuildConfiguration;
73837394
buildSettings = {
73847395
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../mullvad-api/include";
7396+
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios/release";
7397+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=arm64]" = "$(PROJECT_DIR)/../target/aarch64-apple-ios-sim/release";
7398+
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=x86_64]" = "$(PROJECT_DIR)/../target/x86_64-apple-ios/release";
73857399
PRODUCT_NAME = MullvadVPNUITests;
73867400
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/MullvadVPNUITests/BridgingHeader.h";
73877401
};

‎ios/MullvadVPNUITests/BridgingHeader.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@
66
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
77
//
88

9-
#ifndef BridgingHeader_h
10-
#define BridgingHeader_h
9+
#import <Foundation/Foundation.h>
1110
#include "mullvad-api.h"
12-
13-
#endif /* BridgingHeader_h */

0 commit comments

Comments
 (0)