Skip to content

Commit c0b2688

Browse files
kp-diego-trevisankp-diego-trevisan
committed
KM-13513 Move UI dependencies from PIALibrary to apps project
1 parent 60c6090 commit c0b2688

4 files changed

Lines changed: 48 additions & 55 deletions

File tree

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Requires special Apple entitlement. If unavailable:
169169

170170
## Key Files
171171

172-
- `PIA VPN.xcodeproj`, `Podfile` (legacy), `swiftgen.yml`
172+
- `PIA VPN.xcodeproj`, `swiftgen.yml`
173173
- `fastlane/Fastfile`, `.gitlab-ci.yml`, `ci_scripts/`
174174
- `README.md`, `CONTRIBUTING.md`
175175
- Test plans: `TestPlans/*.xctestplan`

‎LocalPackages/PIALibrary/Package.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ let package = Package(
2828
.package(url: "git@github.com:pia-foss/mobile-ios-openvpn.git", branch: "master"),
2929
.package(url: "git@github.com:pia-foss/mobile-ios-wireguard.git", revision: "bf7b4258d9c9279c6051bba0b7a73ca7d5f9547e"),
3030
.package(url: "https://github.com/hkellaway/Gloss.git", from: "3.1.0"),
31-
.package(url: "https://github.com/huri000/SwiftEntryKit.git", from: "1.0.3"),
32-
.package(url: "https://github.com/Orderella/PopupDialog.git", branch: "master"),
33-
.package(url: "https://github.com/apple/swift-log", from: "1.8.0"),
3431
.package(url: "https://github.com/ashleymills/Reachability.swift.git", from: "4.3.0"),
3532
.package(url: "git@github.com:pia-foss/mobile-ios-networking.git", exact: "1.3.1")
3633
],
@@ -40,9 +37,6 @@ let package = Package(
4037
dependencies: [
4138
"Gloss",
4239
"PIALibraryUtilObjC",
43-
.product(name: "Logging", package: "swift-log"),
44-
.product(name: "PopupDialog", package: "PopupDialog", condition: .when(platforms: [.iOS])),
45-
.product(name: "SwiftEntryKit", package: "SwiftEntryKit", condition: .when(platforms: [.iOS])),
4640
.product(name: "Reachability", package: "Reachability.swift"),
4741
.product(name: "PIAKPI", package: "mobile-ios-releases-kpi"),
4842
.product(name: "PIACSI", package: "mobile-ios-releases-csi"),

‎PIA VPN.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
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+
3F557CF02EF59BE2002FB559 /* SwiftEntryKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */; };
37+
3F557CF32EF59C1C002FB559 /* PopupDialog in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF22EF59C1C002FB559 /* PopupDialog */; };
38+
3F557CF52EF59C34002FB559 /* SwiftEntryKit in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF42EF59C34002FB559 /* SwiftEntryKit */; };
39+
3F557CF72EF59C39002FB559 /* PopupDialog in Frameworks */ = {isa = PBXBuildFile; productRef = 3F557CF62EF59C39002FB559 /* PopupDialog */; };
3640
3F7B4C8B2EE7332B00EE1F4C /* PIADesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7B4C8A2EE7332B00EE1F4C /* PIADesignSystem */; };
3741
3F7B4C8D2EE7333300EE1F4C /* PIADesignSystem in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7B4C8C2EE7333300EE1F4C /* PIADesignSystem */; };
3842
3F7BD9B82EE8A09800EE1F4C /* PIALibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7BD9B72EE8A09800EE1F4C /* PIALibrary */; };
@@ -45,13 +49,10 @@
4549
8269A6D6251CB5E0000B4DBF /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8269A67C251CB4BA000B4DBF /* WidgetKit.framework */; };
4650
8269A6D7251CB5E0000B4DBF /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8269A67E251CB4BA000B4DBF /* SwiftUI.framework */; };
4751
8269A6E3251CB5E3000B4DBF /* PIAWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 8269A6D5251CB5E0000B4DBF /* PIAWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
48-
AA36CDBB28A6622A00180A33 /* TweetNacl in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDBA28A6622A00180A33 /* TweetNacl */; };
4952
AA36CDC428A6711300180A33 /* Popover in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDC328A6711300180A33 /* Popover */; };
5053
AA36CDC928A6733500180A33 /* DZNEmptyDataSet in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDC828A6733500180A33 /* DZNEmptyDataSet */; };
5154
AA36CDCC28A673C900180A33 /* GradientProgressBar in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDCB28A673C900180A33 /* GradientProgressBar */; };
5255
AA36CDCF28A6746500180A33 /* SideMenu in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDCE28A6746500180A33 /* SideMenu */; };
53-
AA36CDDB28A6860F00180A33 /* TweetNacl in Frameworks */ = {isa = PBXBuildFile; productRef = AA36CDDA28A6860F00180A33 /* TweetNacl */; };
54-
AABF826D28AD185E00CDAC64 /* TweetNacl in Frameworks */ = {isa = PBXBuildFile; productRef = AABF826C28AD185E00CDAC64 /* TweetNacl */; };
5556
AABF826F28AD187800CDAC64 /* Popover in Frameworks */ = {isa = PBXBuildFile; productRef = AABF826E28AD187800CDAC64 /* Popover */; };
5657
AABF827328AE2FF500CDAC64 /* GradientProgressBar in Frameworks */ = {isa = PBXBuildFile; productRef = AABF827228AE2FF500CDAC64 /* GradientProgressBar */; };
5758
AABF827528AE2FFE00CDAC64 /* SideMenu in Frameworks */ = {isa = PBXBuildFile; productRef = AABF827428AE2FFE00CDAC64 /* SideMenu */; };
@@ -491,10 +492,11 @@
491492
0EE2205C1F4EF307002805AE /* CoreGraphics.framework in Frameworks */,
492493
AABF826F28AD187800CDAC64 /* Popover in Frameworks */,
493494
0EE2205F1F4EF307002805AE /* StoreKit.framework in Frameworks */,
495+
3F557CF52EF59C34002FB559 /* SwiftEntryKit in Frameworks */,
494496
0EE2205D1F4EF307002805AE /* UIKit.framework in Frameworks */,
495497
0EE2205E1F4EF307002805AE /* Foundation.framework in Frameworks */,
498+
3F557CF72EF59C39002FB559 /* PopupDialog in Frameworks */,
496499
3F7BD9BA2EE8A09C00EE1F4C /* PIALibrary in Frameworks */,
497-
AABF826D28AD185E00CDAC64 /* TweetNacl in Frameworks */,
498500
AABF827528AE2FFE00CDAC64 /* SideMenu in Frameworks */,
499501
);
500502
runOnlyForDeploymentPostprocessing = 0;
@@ -521,7 +523,6 @@
521523
AA36CDC428A6711300180A33 /* Popover in Frameworks */,
522524
AA36CDCC28A673C900180A33 /* GradientProgressBar in Frameworks */,
523525
AA36CDCF28A6746500180A33 /* SideMenu in Frameworks */,
524-
AA36CDBB28A6622A00180A33 /* TweetNacl in Frameworks */,
525526
2909869018566430002D9687 /* Security.framework in Frameworks */,
526527
299E58511856BD31004CFD63 /* SystemConfiguration.framework in Frameworks */,
527528
299E585F1856C6EE004CFD63 /* libz.dylib in Frameworks */,
@@ -530,8 +531,10 @@
530531
291C6382183EBC210039EC03 /* CoreGraphics.framework in Frameworks */,
531532
291C6384183EBC210039EC03 /* UIKit.framework in Frameworks */,
532533
DD606ABA21C7A17900E0781D /* NetworkExtension.framework in Frameworks */,
534+
3F557CF02EF59BE2002FB559 /* SwiftEntryKit in Frameworks */,
533535
AA36CDC928A6733500180A33 /* DZNEmptyDataSet in Frameworks */,
534536
3F7BD9B82EE8A09800EE1F4C /* PIALibrary in Frameworks */,
537+
3F557CF32EF59C1C002FB559 /* PopupDialog in Frameworks */,
535538
291C6380183EBC210039EC03 /* Foundation.framework in Frameworks */,
536539
0E9785861DA82FF000711A24 /* StoreKit.framework in Frameworks */,
537540
);
@@ -569,7 +572,6 @@
569572
buildActionMask = 2147483647;
570573
files = (
571574
3F7BD9BE2EE8A0AB00EE1F4C /* PIALibrary in Frameworks */,
572-
AA36CDDB28A6860F00180A33 /* TweetNacl in Frameworks */,
573575
DDC8F5F923EC10E4005D19C6 /* NetworkExtension.framework in Frameworks */,
574576
);
575577
runOnlyForDeploymentPostprocessing = 0;
@@ -736,13 +738,14 @@
736738
);
737739
name = "PIA VPN dev";
738740
packageProductDependencies = (
739-
AABF826C28AD185E00CDAC64 /* TweetNacl */,
740741
AABF826E28AD187800CDAC64 /* Popover */,
741742
AABF827228AE2FF500CDAC64 /* GradientProgressBar */,
742743
AABF827428AE2FFE00CDAC64 /* SideMenu */,
743744
AABF827728AE333200CDAC64 /* DZNEmptyDataSet */,
744745
3F7B4C8C2EE7333300EE1F4C /* PIADesignSystem */,
745746
3F7BD9B92EE8A09C00EE1F4C /* PIALibrary */,
747+
3F557CF42EF59C34002FB559 /* SwiftEntryKit */,
748+
3F557CF62EF59C39002FB559 /* PopupDialog */,
746749
);
747750
productName = "PIA VPN";
748751
productReference = 0EE2207A1F4EF307002805AE /* PIA VPN dev.app */;
@@ -811,13 +814,14 @@
811814
);
812815
name = "PIA VPN";
813816
packageProductDependencies = (
814-
AA36CDBA28A6622A00180A33 /* TweetNacl */,
815817
AA36CDC328A6711300180A33 /* Popover */,
816818
AA36CDC828A6733500180A33 /* DZNEmptyDataSet */,
817819
AA36CDCB28A673C900180A33 /* GradientProgressBar */,
818820
AA36CDCE28A6746500180A33 /* SideMenu */,
819821
3F7B4C8A2EE7332B00EE1F4C /* PIADesignSystem */,
820822
3F7BD9B72EE8A09800EE1F4C /* PIALibrary */,
823+
3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */,
824+
3F557CF22EF59C1C002FB559 /* PopupDialog */,
821825
);
822826
productName = "PIA VPN";
823827
productReference = 291C637C183EBC210039EC03 /* PIA VPN.app */;
@@ -907,7 +911,6 @@
907911
);
908912
name = "PIA VPN WG Tunnel";
909913
packageProductDependencies = (
910-
AA36CDDA28A6860F00180A33 /* TweetNacl */,
911914
3F7BD9BD2EE8A0AB00EE1F4C /* PIALibrary */,
912915
);
913916
productName = "PIA VPN WG Tunnel";
@@ -1154,14 +1157,15 @@
11541157
);
11551158
mainGroup = 291C6373183EBC210039EC03;
11561159
packageReferences = (
1157-
AA36CDB928A6622A00180A33 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */,
11581160
AA36CDC228A6711300180A33 /* XCRemoteSwiftPackageReference "Popover" */,
11591161
AA36CDC728A6733500180A33 /* XCRemoteSwiftPackageReference "DZNEmptyDataSet" */,
11601162
AA36CDCA28A673C900180A33 /* XCRemoteSwiftPackageReference "GradientProgressBar" */,
11611163
AA36CDCD28A6746500180A33 /* XCRemoteSwiftPackageReference "SideMenu" */,
11621164
35950B2F2ADD2877006F3CD9 /* XCRemoteSwiftPackageReference "Quick" */,
11631165
35950B322ADD2EE5006F3CD9 /* XCRemoteSwiftPackageReference "Nimble" */,
11641166
E548E1EE2C12383E001E9874 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
1167+
3F557CEE2EF59BE2002FB559 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */,
1168+
3F557CF12EF59C1C002FB559 /* XCRemoteSwiftPackageReference "PopupDialog" */,
11651169
);
11661170
preferredProjectObjectVersion = 46;
11671171
productRefGroup = 291C637D183EBC210039EC03 /* Products */;
@@ -2848,12 +2852,20 @@
28482852
version = 13.0.0;
28492853
};
28502854
};
2851-
AA36CDB928A6622A00180A33 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */ = {
2855+
3F557CEE2EF59BE2002FB559 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */ = {
28522856
isa = XCRemoteSwiftPackageReference;
2853-
repositoryURL = "https://github.com/bitmark-inc/tweetnacl-swiftwrap.git";
2857+
repositoryURL = "https://github.com/huri000/SwiftEntryKit.git";
28542858
requirement = {
28552859
kind = exactVersion;
2856-
version = 1.1.0;
2860+
version = 2.0.0;
2861+
};
2862+
};
2863+
3F557CF12EF59C1C002FB559 /* XCRemoteSwiftPackageReference "PopupDialog" */ = {
2864+
isa = XCRemoteSwiftPackageReference;
2865+
repositoryURL = "https://github.com/Orderella/PopupDialog.git";
2866+
requirement = {
2867+
branch = master;
2868+
kind = branch;
28572869
};
28582870
};
28592871
AA36CDC228A6711300180A33 /* XCRemoteSwiftPackageReference "Popover" */ = {
@@ -2919,6 +2931,26 @@
29192931
package = 35950B322ADD2EE5006F3CD9 /* XCRemoteSwiftPackageReference "Nimble" */;
29202932
productName = Nimble;
29212933
};
2934+
3F557CEF2EF59BE2002FB559 /* SwiftEntryKit */ = {
2935+
isa = XCSwiftPackageProductDependency;
2936+
package = 3F557CEE2EF59BE2002FB559 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */;
2937+
productName = SwiftEntryKit;
2938+
};
2939+
3F557CF22EF59C1C002FB559 /* PopupDialog */ = {
2940+
isa = XCSwiftPackageProductDependency;
2941+
package = 3F557CF12EF59C1C002FB559 /* XCRemoteSwiftPackageReference "PopupDialog" */;
2942+
productName = PopupDialog;
2943+
};
2944+
3F557CF42EF59C34002FB559 /* SwiftEntryKit */ = {
2945+
isa = XCSwiftPackageProductDependency;
2946+
package = 3F557CEE2EF59BE2002FB559 /* XCRemoteSwiftPackageReference "SwiftEntryKit" */;
2947+
productName = SwiftEntryKit;
2948+
};
2949+
3F557CF62EF59C39002FB559 /* PopupDialog */ = {
2950+
isa = XCSwiftPackageProductDependency;
2951+
package = 3F557CF12EF59C1C002FB559 /* XCRemoteSwiftPackageReference "PopupDialog" */;
2952+
productName = PopupDialog;
2953+
};
29222954
3F7B4C8A2EE7332B00EE1F4C /* PIADesignSystem */ = {
29232955
isa = XCSwiftPackageProductDependency;
29242956
productName = PIADesignSystem;
@@ -2947,11 +2979,6 @@
29472979
isa = XCSwiftPackageProductDependency;
29482980
productName = PIALibrary;
29492981
};
2950-
AA36CDBA28A6622A00180A33 /* TweetNacl */ = {
2951-
isa = XCSwiftPackageProductDependency;
2952-
package = AA36CDB928A6622A00180A33 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */;
2953-
productName = TweetNacl;
2954-
};
29552982
AA36CDC328A6711300180A33 /* Popover */ = {
29562983
isa = XCSwiftPackageProductDependency;
29572984
package = AA36CDC228A6711300180A33 /* XCRemoteSwiftPackageReference "Popover" */;
@@ -2972,16 +2999,6 @@
29722999
package = AA36CDCD28A6746500180A33 /* XCRemoteSwiftPackageReference "SideMenu" */;
29733000
productName = SideMenu;
29743001
};
2975-
AA36CDDA28A6860F00180A33 /* TweetNacl */ = {
2976-
isa = XCSwiftPackageProductDependency;
2977-
package = AA36CDB928A6622A00180A33 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */;
2978-
productName = TweetNacl;
2979-
};
2980-
AABF826C28AD185E00CDAC64 /* TweetNacl */ = {
2981-
isa = XCSwiftPackageProductDependency;
2982-
package = AA36CDB928A6622A00180A33 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */;
2983-
productName = TweetNacl;
2984-
};
29853002
AABF826E28AD187800CDAC64 /* Popover */ = {
29863003
isa = XCSwiftPackageProductDependency;
29873004
package = AA36CDC228A6711300180A33 /* XCRemoteSwiftPackageReference "Popover" */;

‎PIA VPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 2 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)