Skip to content

Commit

Permalink
KM-4542: Add explicit dependency to mobile-ios-networking package
Browse files Browse the repository at this point in the history
  • Loading branch information
kp-laura-sempere committed Jul 4, 2024
1 parent a4a4164 commit e422804
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 24 deletions.
10 changes: 6 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// swift-tools-version:5.8
// swift-tools-version:5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -9,7 +9,7 @@ let package = Package(
defaultLocalization: "en",
platforms: [
.iOS(.v12),
.tvOS(.v16)
.tvOS(.v17)
],
products: [
.library(
Expand All @@ -34,7 +34,8 @@ let package = Package(
.package(url: "https://github.com/SwiftyBeaver/SwiftyBeaver.git", from: "1.9.0"),
.package(url: "https://github.com/ashleymills/Reachability.swift.git", from: "4.3.0"),
.package(url: "https://github.com/michaeltyson/TPKeyboardAvoiding.git", from: "1.3.5"),
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: "5.0.1")
.package(url: "https://github.com/Alamofire/Alamofire.git", exact: "5.0.1"),
.package(url: "[email protected]:pia-foss/mobile-ios-networking.git", exact: "1.3.1")
],
targets: [
.target(
Expand All @@ -55,7 +56,8 @@ let package = Package(
.product(name: "PIAWireguard", package: "mobile-ios-wireguard", condition: .when(platforms: [.iOS])),
.product(name: "TunnelKit", package: "mobile-ios-openvpn", condition: .when(platforms: [.iOS])),
.product(name: "TunnelKitOpenVPN", package: "mobile-ios-openvpn", condition: TargetDependencyCondition.when(platforms: [.iOS])),
.product(name: "TunnelKitOpenVPNAppExtension", package: "mobile-ios-openvpn", condition: TargetDependencyCondition.when(platforms: [.iOS]))
.product(name: "TunnelKitOpenVPNAppExtension", package: "mobile-ios-openvpn", condition: TargetDependencyCondition.when(platforms: [.iOS])),
.product(name: "NWHttpConnection", package: "mobile-ios-networking")
],
resources: [
.process("Resources")
Expand Down
14 changes: 0 additions & 14 deletions Sources/PIALibrary/WebServices/PIAWebServices.swift
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,6 @@ class PIAWebServices: WebServices, ConfigurationAccess {
return "PIA"
}()

/***
The token to use for protocol authentication.
*/
var vpnToken: String? {
return self.accountAPI.vpnToken()
}

/***
The token to use for api authentication.
*/
var apiToken: String? {
return self.accountAPI.apiToken()
}

/***
Generates a new auth expiring token based on a previous non-expiry one.
*/
Expand Down
6 changes: 0 additions & 6 deletions Sources/PIALibrary/WebServices/WebServices.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ protocol WebServices: class {
func migrateToken(token: String, _ callback: SuccessLibraryCallback?)

func update(credentials: Credentials, resetPassword reset: Bool, email: String, _ callback: SuccessLibraryCallback?)

/// The token to use for protocol authentication.
var vpnToken: String? { get }

/// The token to use for api authentication.
var apiToken: String? { get }

// MARK: DIP Token

Expand Down

0 comments on commit e422804

Please sign in to comment.