Browse Source

Revert PromiseKit update for now

Michael Kirk 7 months ago
parent
commit
62023659a1
3 changed files with 15 additions and 10 deletions
  1. 4 0
      Podfile
  2. 10 9
      Podfile.lock
  3. 1 1
      Pods

+ 4 - 0
Podfile

@@ -26,6 +26,10 @@ def shared_pods
 
   pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
 
+  # Project does not compile with PromiseKit 6.7.1
+  # see: https://github.com/mxcl/PromiseKit/issues/990
+  pod 'PromiseKit', "6.5.3"
+
   ###
   # forked third party pods
   ###

+ 10 - 9
Podfile.lock

@@ -49,14 +49,14 @@ PODS:
   - Mantle (2.1.0):
     - Mantle/extobjc (= 2.1.0)
   - Mantle/extobjc (2.1.0)
-  - PromiseKit (6.7.1):
-    - PromiseKit/CorePromise (= 6.7.1)
-    - PromiseKit/Foundation (= 6.7.1)
-    - PromiseKit/UIKit (= 6.7.1)
-  - PromiseKit/CorePromise (6.7.1)
-  - PromiseKit/Foundation (6.7.1):
+  - PromiseKit (6.5.3):
+    - PromiseKit/CorePromise (= 6.5.3)
+    - PromiseKit/Foundation (= 6.5.3)
+    - PromiseKit/UIKit (= 6.5.3)
+  - PromiseKit/CorePromise (6.5.3)
+  - PromiseKit/Foundation (6.5.3):
     - PromiseKit/CorePromise
-  - PromiseKit/UIKit (6.7.1):
+  - PromiseKit/UIKit (6.5.3):
     - PromiseKit/CorePromise
   - PureLayout (3.1.4)
   - Reachability (3.2)
@@ -197,6 +197,7 @@ DEPENDENCIES:
   - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`)
   - HKDFKit/Tests (from `https://github.com/signalapp/HKDFKit.git`)
   - Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`)
+  - PromiseKit (= 6.5.3)
   - PureLayout
   - Reachability
   - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`)
@@ -289,7 +290,7 @@ SPEC CHECKSUMS:
   HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
   Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
-  PromiseKit: ef376fb8b4e92edfeb66bd403b983eaa07fbde0c
+  PromiseKit: c609029bdd801f792551a504c695c7d3098b42cd
   PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
@@ -303,6 +304,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: 7856bf087f931a4089ebd9a08ed1dfe8389b8afc
+PODFILE CHECKSUM: 734d9629db64e8917162287fda2e788517693d1f
 
 COCOAPODS: 1.5.3

+ 1 - 1
Pods

@@ -1 +1 @@
-Subproject commit c97453862a7d33858e8e942e30227c2595a0b0db
+Subproject commit 85ace261f390007e5dc84e86ecf97b5b37ff8645