summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-12-10 11:13:52 +0100
committerAndrej Mihajlov <and@mullvad.net>2019-12-10 11:13:52 +0100
commit87eeab54df529f6129da48eba32fbbc4c196649d (patch)
tree3bc3e669599a6d09c3a8e45165e6e1d120913b9a
parent1d30b36e9d798613cd1b308d9e3e86d2853dc3ca (diff)
parent095d52c1a167e3ee0a1e7de1fba2353a39ad7373 (diff)
downloadmullvadvpn-87eeab54df529f6129da48eba32fbbc4c196649d.tar.xz
mullvadvpn-87eeab54df529f6129da48eba32fbbc4c196649d.zip
Merge branch 'remove-pods'
-rw-r--r--ios/MullvadVPN/ProcedureKit+Patches.swift49
-rw-r--r--ios/Podfile22
-rw-r--r--ios/Podfile.lock21
3 files changed, 0 insertions, 92 deletions
diff --git a/ios/MullvadVPN/ProcedureKit+Patches.swift b/ios/MullvadVPN/ProcedureKit+Patches.swift
deleted file mode 100644
index 86b644f6a2..0000000000
--- a/ios/MullvadVPN/ProcedureKit+Patches.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// ProcedureKit+Patches.swift
-// MullvadVPN
-//
-// Created by pronebird on 10/06/2019.
-// Copyright © 2019 Amagicom AB. All rights reserved.
-//
-
-import ProcedureKit
-
-extension InputProcedure {
-
- /// The original implementation of bind(to: T) has a bug
- /// This is an attempt to temporarily patch it.
- /// Github issue: https://github.com/ProcedureKit/ProcedureKit/issues/936
- func bindAndNotifySetInputReady<T: InputProcedure>(to target: T) where T.Input == Self.Input {
- addDidSetInputReadyBlockObserver { (procedure) in
- if case .ready = procedure.input {
- target.input = procedure.input
- target.didSetInputReady()
- }
- }
- }
-}
-
-extension ProcedureResult {
- /// Turn ProcedureResult into Swift 5 Result<T, Error>
- func into() -> Result<Value, Error> {
- switch self {
- case .success(let value):
- return .success(value)
- case .failure(let error):
- return .failure(error)
- }
- }
-}
-
-extension Result {
- /// Turn Swift 5 Result<T, _> into ProcedureResult<T>
- func into() -> ProcedureResult<Success> {
- switch self {
- case .success(let value):
- return .success(value)
- case .failure(let error):
- return .failure(error)
- }
- }
-
-}
diff --git a/ios/Podfile b/ios/Podfile
deleted file mode 100644
index 0b7cf77ceb..0000000000
--- a/ios/Podfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Uncomment the next line to define a global platform for your project
-platform :ios, '12.0'
-
-# Disable sending stats
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-def shared_pods
- pod 'ProcedureKit', '5.2.0'
- pod 'ProcedureKit/Network', '5.2.0'
-end
-
-target 'MullvadVPN' do
- use_frameworks!
-
- shared_pods
-end
-
-target 'PacketTunnel' do
- use_frameworks!
-
- shared_pods
-end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
deleted file mode 100644
index c88d9bf462..0000000000
--- a/ios/Podfile.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-PODS:
- - ProcedureKit (5.2.0):
- - ProcedureKit/Standard (= 5.2.0)
- - ProcedureKit/Network (5.2.0):
- - ProcedureKit/Standard
- - ProcedureKit/Standard (5.2.0)
-
-DEPENDENCIES:
- - ProcedureKit (= 5.2.0)
- - ProcedureKit/Network (= 5.2.0)
-
-SPEC REPOS:
- https://github.com/cocoapods/specs.git:
- - ProcedureKit
-
-SPEC CHECKSUMS:
- ProcedureKit: deafeab083a0c5e45e4b02379e0ffa316d03db29
-
-PODFILE CHECKSUM: 102b3dc384fbaf6c4b7be36bf6283ba1c9825878
-
-COCOAPODS: 1.6.1