mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Make Console develop use MatrixSDK develop branch (instead of matrix_kit)
This commit is contained in:
parent
e33e067641
commit
b21d7c115e
2 changed files with 26 additions and 18 deletions
2
Podfile
2
Podfile
|
@ -14,7 +14,7 @@ target "matrixConsole" do
|
|||
#pod 'MatrixKit'
|
||||
|
||||
# The develop branch version
|
||||
pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'matrix_kit'
|
||||
pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
|
||||
pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
|
||||
|
||||
# The one used for developping both MatrixSDK and MatrixKit
|
||||
|
|
42
Podfile.lock
42
Podfile.lock
|
@ -1,23 +1,23 @@
|
|||
PODS:
|
||||
- AFNetworking (2.5.2):
|
||||
- AFNetworking/NSURLConnection (= 2.5.2)
|
||||
- AFNetworking/NSURLSession (= 2.5.2)
|
||||
- AFNetworking/Reachability (= 2.5.2)
|
||||
- AFNetworking/Security (= 2.5.2)
|
||||
- AFNetworking/Serialization (= 2.5.2)
|
||||
- AFNetworking/UIKit (= 2.5.2)
|
||||
- AFNetworking/NSURLConnection (2.5.2):
|
||||
- AFNetworking (2.5.3):
|
||||
- AFNetworking/NSURLConnection (= 2.5.3)
|
||||
- AFNetworking/NSURLSession (= 2.5.3)
|
||||
- AFNetworking/Reachability (= 2.5.3)
|
||||
- AFNetworking/Security (= 2.5.3)
|
||||
- AFNetworking/Serialization (= 2.5.3)
|
||||
- AFNetworking/UIKit (= 2.5.3)
|
||||
- AFNetworking/NSURLConnection (2.5.3):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/NSURLSession (2.5.2):
|
||||
- AFNetworking/NSURLSession (2.5.3):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/Reachability (2.5.2)
|
||||
- AFNetworking/Security (2.5.2)
|
||||
- AFNetworking/Serialization (2.5.2)
|
||||
- AFNetworking/UIKit (2.5.2):
|
||||
- AFNetworking/Reachability (2.5.3)
|
||||
- AFNetworking/Security (2.5.3)
|
||||
- AFNetworking/Serialization (2.5.3)
|
||||
- AFNetworking/UIKit (2.5.3):
|
||||
- AFNetworking/NSURLConnection
|
||||
- AFNetworking/NSURLSession
|
||||
- GBDeviceInfo (2.2.10)
|
||||
|
@ -36,23 +36,31 @@ DEPENDENCIES:
|
|||
- GBDeviceInfo (~> 2.2.9)
|
||||
- libPhoneNumber-iOS (~> 0.7.6)
|
||||
- MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
|
||||
- MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `matrix_kit`)
|
||||
- MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
MatrixKit:
|
||||
:branch: develop
|
||||
:git: https://github.com/matrix-org/matrix-ios-kit.git
|
||||
MatrixSDK:
|
||||
:branch: matrix_kit
|
||||
:branch: develop
|
||||
:git: https://github.com/matrix-org/matrix-ios-sdk.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
MatrixKit:
|
||||
:commit: e2b6cb5135bc087126f9fd85b6e2716e7148fe5b
|
||||
:git: https://github.com/matrix-org/matrix-ios-kit.git
|
||||
MatrixSDK:
|
||||
:commit: a1be1ddcbc94976400ef22f3c5e10fdd4a510ccc
|
||||
:git: https://github.com/matrix-org/matrix-ios-sdk.git
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
AFNetworking: fefbce9660acb17f48ae0011292d4da0f457bf36
|
||||
AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
|
||||
GBDeviceInfo: 5866e2f529547f8a4c3c6917dc40ac53acd75234
|
||||
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
|
||||
libPhoneNumber-iOS: fb90c5e0d100923b61f0db81de56daefbb67b103
|
||||
Mantle: 60acd0cd363e27d945bda0a6b8e90577112d28f3
|
||||
MatrixKit: fb7e355bc54e4669842dcc7e29bbb05dd1d66812
|
||||
MatrixKit: 7605738714f6b45f0a746289aa468ad208f4772e
|
||||
MatrixSDK: e9c1a64b8357231c2e036bfe5bb009b0141e21b5
|
||||
|
||||
COCOAPODS: 0.36.3
|
||||
|
|
Loading…
Reference in a new issue