Skip to content

Commit ccf840d

Browse files
kp-diego-trevisankp-diego-trevisan
committed
KM-13582 Resolve rebase conflicts
1 parent 276c165 commit ccf840d

1 file changed

Lines changed: 30 additions & 24 deletions

File tree

‎PIA VPN.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,20 @@
3333
35950B342ADD2EE5006F3CD9 /* Nimble in Frameworks */ = {isa = PBXBuildFile; productRef = 35950B332ADD2EE5006F3CD9 /* Nimble */; };
3434
35E8E6762B8C39A400A3A3DB /* Quick in Frameworks */ = {isa = PBXBuildFile; productRef = 35E8E6752B8C39A400A3A3DB /* Quick */; };
3535
35E8E6782B8C39AA00A3A3DB /* Nimble in Frameworks */ = {isa = PBXBuildFile; productRef = 35E8E6772B8C39AA00A3A3DB /* Nimble */; };
36+
3F3203CE2F0BE52C0070EC47 /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3F3203CD2F0BE52C0070EC47 /* PIASwiftUI */; };
3637
3F557CF02EF59BE2002FB559 /* SwiftEntryKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */; };
3738
3F557CF32EF59C1C002FB559 /* PopupDialog in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF22EF59C1C002FB559 /* PopupDialog */; };
3839
3F557CF52EF59C34002FB559 /* SwiftEntryKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF42EF59C34002FB559 /* SwiftEntryKit */; };
3940
3F557CF72EF59C39002FB559 /* PopupDialog in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF62EF59C39002FB559 /* PopupDialog */; };
40-
3F7B4C8B2EE7332B00EE1F4C /* PIADesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7B4C8A2EE7332B00EE1F4C /* PIADesignSystem */; };
41-
3F7B4C8D2EE7333300EE1F4C /* PIADesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7B4C8C2EE7333300EE1F4C /* PIADesignSystem */; };
4241
3F7BD9B82EE8A09800EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9B72EE8A09800EE1F4C /* PIALibrary */; };
4342
3F7BD9BA2EE8A09C00EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9B92EE8A09C00EE1F4C /* PIALibrary */; };
4443
3F7BD9BC2EE8A0A600EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9BB2EE8A0A600EE1F4C /* PIALibrary */; };
4544
3F7BD9BE2EE8A0AB00EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9BD2EE8A0AB00EE1F4C /* PIALibrary */; };
4645
3F7BD9C02EE8A0AF00EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9BF2EE8A0AF00EE1F4C /* PIALibrary */; };
47-
3FB075242EFBE30700E97F4F /* PIAUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB075232EFBE30700E97F4F /* PIAUIKit */; };
48-
3FB075262EFBE30D00E97F4F /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB075252EFBE30D00E97F4F /* PIASwiftUI */; };
49-
3FB075282EFBE31400E97F4F /* PIAUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB075272EFBE31400E97F4F /* PIAUIKit */; };
50-
3FB0752A2EFBE31A00E97F4F /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB075292EFBE31A00E97F4F /* PIASwiftUI */; };
51-
3FB0752C2EFBE32300E97F4F /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3FB0752B2EFBE32300E97F4F /* PIASwiftUI */; };
52-
695BF81F2AC410E000D1139C /* (null) in Sources */ = {isa = PBXBuildFile; };
46+
3FE266BA2F0BE003004B53AA /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3FE266B92F0BE003004B53AA /* PIASwiftUI */; };
47+
3FE266BC2F0BE003004B53AA /* PIAUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3FE266BB2F0BE003004B53AA /* PIAUIKit */; };
48+
3FE266BE2F0BE00F004B53AA /* PIAUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3FE266BD2F0BE00F004B53AA /* PIAUIKit */; };
49+
3FE266C02F0BE014004B53AA /* PIASwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3FE266BF2F0BE014004B53AA /* PIASwiftUI */; };
5350
698F4F2B2AB8A2080010B2B0 /* PIAWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 8269A6D5251CB5E0000B4DBF /* PIAWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
5451
8269A6D6251CB5E0000B4DBF /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8269A67C251CB4BA000B4DBF /* WidgetKit.framework */; };
5552
8269A6D7251CB5E0000B4DBF /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8269A67E251CB4BA000B4DBF /* SwiftUI.framework */; };
@@ -487,7 +484,7 @@
487484
AABF827628AE302300CDAC64 /* NetworkExtension.framework in Frameworks */,
488485
0EE220571F4EF307002805AE /* Security.framework in Frameworks */,
489486
0EE220581F4EF307002805AE /* SystemConfiguration.framework in Frameworks */,
490-
3FB075282EFBE31400E97F4F /* PIAUIKit in Frameworks */,
487+
3FE266BE2F0BE00F004B53AA /* PIAUIKit in Frameworks */,
491488
AABF827328AE2FF500CDAC64 /* GradientProgressBar in Frameworks */,
492489
AABF827828AE333200CDAC64 /* DZNEmptyDataSet in Frameworks */,
493490
0EE220591F4EF307002805AE /* libz.dylib in Frameworks */,
@@ -498,7 +495,7 @@
498495
0EE2205F1F4EF307002805AE /* StoreKit.framework in Frameworks */,
499496
3F557CF52EF59C34002FB559 /* SwiftEntryKit in Frameworks */,
500497
0EE2205D1F4EF307002805AE /* UIKit.framework in Frameworks */,
501-
3FB0752A2EFBE31A00E97F4F /* PIASwiftUI in Frameworks */,
498+
3FE266C02F0BE014004B53AA /* PIASwiftUI in Frameworks */,
502499
0EE2205E1F4EF307002805AE /* Foundation.framework in Frameworks */,
503500
3F557CF72EF59C39002FB559 /* PopupDialog in Frameworks */,
504501
3F7BD9BA2EE8A09C00EE1F4C /* PIALibrary in Frameworks */,
@@ -528,9 +525,11 @@
528525
AA36CDCC28A673C900180A33 /* GradientProgressBar in Frameworks */,
529526
AA36CDCF28A6746500180A33 /* SideMenu in Frameworks */,
530527
2909869018566430002D9687 /* Security.framework in Frameworks */,
528+
3FE266BC2F0BE003004B53AA /* PIAUIKit in Frameworks */,
531529
299E58511856BD31004CFD63 /* SystemConfiguration.framework in Frameworks */,
532530
299E585F1856C6EE004CFD63 /* libz.dylib in Frameworks */,
533531
2934A1741856BCF80099683F /* CoreText.framework in Frameworks */,
532+
3FE266BA2F0BE003004B53AA /* PIASwiftUI in Frameworks */,
534533
2985E5671856BD1200D70E28 /* QuartzCore.framework in Frameworks */,
535534
291C6382183EBC210039EC03 /* CoreGraphics.framework in Frameworks */,
536535
291C6384183EBC210039EC03 /* UIKit.framework in Frameworks */,
@@ -601,7 +600,7 @@
601600
buildActionMask = 2147483647;
602601
files = (
603602
3F7BD9C02EE8A0AF00EE1F4C /* PIALibrary in Frameworks */,
604-
3FB0752C2EFBE32300E97F4F /* PIASwiftUI in Frameworks */,
603+
3F3203CE2F0BE52C0070EC47 /* PIASwiftUI in Frameworks */,
605604
);
606605
runOnlyForDeploymentPostprocessing = 0;
607606
};
@@ -750,6 +749,8 @@
750749
3F7BD9B92EE8A09C00EE1F4C /* PIALibrary */,
751750
3F557CF42EF59C34002FB559 /* SwiftEntryKit */,
752751
3F557CF62EF59C39002FB559 /* PopupDialog */,
752+
3FE266BD2F0BE00F004B53AA /* PIAUIKit */,
753+
3FE266BF2F0BE014004B53AA /* PIASwiftUI */,
753754
);
754755
productName = "PIA VPN";
755756
productReference = 0EE2207A1F4EF307002805AE /* PIA VPN dev.app */;
@@ -825,6 +826,8 @@
825826
3F7BD9B72EE8A09800EE1F4C /* PIALibrary */,
826827
3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */,
827828
3F557CF22EF59C1C002FB559 /* PopupDialog */,
829+
3FE266B92F0BE003004B53AA /* PIASwiftUI */,
830+
3FE266BB2F0BE003004B53AA /* PIAUIKit */,
828831
);
829832
productName = "PIA VPN";
830833
productReference = 291C637C183EBC210039EC03 /* PIA VPN.app */;
@@ -884,7 +887,7 @@
884887
isa = PBXNativeTarget;
885888
buildConfigurationList = 8269A6E4251CB5E3000B4DBF /* Build configuration list for PBXNativeTarget "PIAWidgetExtension" */;
886889
buildPhases = (
887-
8269A6D1251CB5E0000B4DBF /* Sources */,
890+
3F3203B52F0BE30F0070EC47 /* Sources */,
888891
8269A6D2251CB5E0000B4DBF /* Frameworks */,
889892
8269A6D3251CB5E0000B4DBF /* Resources */,
890893
);
@@ -982,7 +985,7 @@
982985
name = "PIA VPN-tvOS";
983986
packageProductDependencies = (
984987
3F7BD9BF2EE8A0AF00EE1F4C /* PIALibrary */,
985-
3FB0752B2EFBE32300E97F4F /* PIASwiftUI */,
988+
3F3203CD2F0BE52C0070EC47 /* PIASwiftUI */,
986989
);
987990
productName = "PIA VPN-tvOS";
988991
productReference = E5C507772B0E144D00200A6A /* PIA VPN-tvOS.app */;
@@ -1383,18 +1386,17 @@
13831386
);
13841387
runOnlyForDeploymentPostprocessing = 0;
13851388
};
1386-
69B70AAC2ACBF51C0072A09D /* Sources */ = {
1389+
3F3203B52F0BE30F0070EC47 /* Sources */ = {
13871390
isa = PBXSourcesBuildPhase;
13881391
buildActionMask = 2147483647;
13891392
files = (
13901393
);
13911394
runOnlyForDeploymentPostprocessing = 0;
13921395
};
1393-
8269A6D1251CB5E0000B4DBF /* Sources */ = {
1396+
69B70AAC2ACBF51C0072A09D /* Sources */ = {
13941397
isa = PBXSourcesBuildPhase;
13951398
buildActionMask = 2147483647;
13961399
files = (
1397-
695BF81F2AC410E000D1139C /* (null) in Sources */,
13981400
);
13991401
runOnlyForDeploymentPostprocessing = 0;
14001402
};
@@ -2935,6 +2937,10 @@
29352937
package = 35950B322ADD2EE5006F3CD9 /* XCRemoteSwiftPackageReference "Nimble" */;
29362938
productName = Nimble;
29372939
};
2940+
3F3203CD2F0BE52C0070EC47 /* PIASwiftUI */ = {
2941+
isa = XCSwiftPackageProductDependency;
2942+
productName = PIASwiftUI;
2943+
};
29382944
3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */ = {
29392945
isa = XCSwiftPackageProductDependency;
29402946
package = 3F557CEE2EF59BE2002FB559 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */;
@@ -2955,14 +2961,6 @@
29552961
package = 3F557CF12EF59C1C002FB559 /* XCRemoteSwiftPackageReference "PopupDialog" */;
29562962
productName = PopupDialog;
29572963
};
2958-
3F7B4C8A2EE7332B00EE1F4C /* PIADesignSystem */ = {
2959-
isa = XCSwiftPackageProductDependency;
2960-
productName = PIADesignSystem;
2961-
};
2962-
3F7B4C8C2EE7333300EE1F4C /* PIADesignSystem */ = {
2963-
isa = XCSwiftPackageProductDependency;
2964-
productName = PIADesignSystem;
2965-
};
29662964
3F7BD9B72EE8A09800EE1F4C /* PIALibrary */ = {
29672965
isa = XCSwiftPackageProductDependency;
29682966
productName = PIALibrary;
@@ -2983,6 +2981,14 @@
29832981
isa = XCSwiftPackageProductDependency;
29842982
productName = PIALibrary;
29852983
};
2984+
3FE266B92F0BE003004B53AA /* PIASwiftUI */ = {
2985+
isa = XCSwiftPackageProductDependency;
2986+
productName = PIASwiftUI;
2987+
};
2988+
3FE266BB2F0BE003004B53AA /* PIAUIKit */ = {
2989+
isa = XCSwiftPackageProductDependency;
2990+
productName = PIAUIKit;
2991+
};
29862992
AA36CDC328A6711300180A33 /* Popover */ = {
29872993
isa = XCSwiftPackageProductDependency;
29882994
package = AA36CDC228A6711300180A33 /* XCRemoteSwiftPackageReference "Popover" */;

0 commit comments

Comments
 (0)