Adapting to renaming.
This commit is contained in:
parent
5ff06afe10
commit
4034baedb9
2
Podfile
2
Podfile
|
@ -2,7 +2,7 @@ platform :ios, '8.0'
|
|||
source 'https://github.com/CocoaPods/Specs.git'
|
||||
link_with ["Signal", "SignalTests"]
|
||||
|
||||
pod 'TextSecureKit', :git => 'https://github.com/WhisperSystems/TextSecureKit', :branch => 'master'
|
||||
pod 'SignalServiceKit', :git => 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'test'
|
||||
pod 'OpenSSL', '~> 1.0.205'
|
||||
pod 'PastelogKit', '~> 1.3'
|
||||
pod 'FFCircularProgressView', '~> 0.5'
|
||||
|
|
30
Podfile.lock
30
Podfile.lock
|
@ -42,12 +42,7 @@ PODS:
|
|||
- CocoaLumberjack (~> 2.0)
|
||||
- ProtocolBuffers (1.9.10)
|
||||
- SCWaveformView (1.0.0)
|
||||
- SocketRocket-PinningPolicy (0.4.3)
|
||||
- SQLCipher/common (3.3.1)
|
||||
- SQLCipher/fts (3.3.1):
|
||||
- SQLCipher/common
|
||||
- SSKeychain (1.4.0)
|
||||
- TextSecureKit (0.0.4):
|
||||
- SignalServiceKit (0.0.4):
|
||||
- '25519'
|
||||
- AFNetworking
|
||||
- AxolotlKit
|
||||
|
@ -58,6 +53,11 @@ PODS:
|
|||
- SSKeychain
|
||||
- TwistedOakCollapsingFutures
|
||||
- YapDatabase/SQLCipher
|
||||
- SocketRocket-PinningPolicy (0.4.3)
|
||||
- SQLCipher/common (3.3.1)
|
||||
- SQLCipher/fts (3.3.1):
|
||||
- SQLCipher/common
|
||||
- SSKeychain (1.4.0)
|
||||
- TwistedOakCollapsingFutures (1.0.0):
|
||||
- UnionFind (~> 1.0)
|
||||
- UnionFind (1.0.1)
|
||||
|
@ -112,24 +112,24 @@ DEPENDENCIES:
|
|||
- OpenSSL (~> 1.0.205)
|
||||
- PastelogKit (~> 1.3)
|
||||
- SCWaveformView (~> 1.0)
|
||||
- TextSecureKit (from `https://github.com/WhisperSystems/TextSecureKit`, branch
|
||||
`master`)
|
||||
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`,
|
||||
branch `test`)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
JSQMessagesViewController:
|
||||
:commit: e5582fef8a6b3e35f8070361ef37237222da712b
|
||||
:git: https://github.com/WhisperSystems/JSQMessagesViewController
|
||||
TextSecureKit:
|
||||
:branch: master
|
||||
:git: https://github.com/WhisperSystems/TextSecureKit
|
||||
SignalServiceKit:
|
||||
:branch: test
|
||||
:git: https://github.com/WhisperSystems/SignalServiceKit.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
JSQMessagesViewController:
|
||||
:commit: e5582fef8a6b3e35f8070361ef37237222da712b
|
||||
:git: https://github.com/WhisperSystems/JSQMessagesViewController
|
||||
TextSecureKit:
|
||||
:commit: b5a8cf0f0d4e7bde175ae72b4e813bd284538fd1
|
||||
:git: https://github.com/WhisperSystems/TextSecureKit
|
||||
SignalServiceKit:
|
||||
:commit: 518c44ce9ad3b005146669972d84e8d4c4477005
|
||||
:git: https://github.com/WhisperSystems/SignalServiceKit.git
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
'25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
|
||||
|
@ -147,10 +147,10 @@ SPEC CHECKSUMS:
|
|||
PastelogKit: 7b475be4cf577713506a943dd940bcc0499c8bca
|
||||
ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b
|
||||
SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
|
||||
SignalServiceKit: fff03a2fbc089417860acaef4faa66c415448199
|
||||
SocketRocket-PinningPolicy: f2ef00c3927bac05cd04d9d5171f82d922b40d3d
|
||||
SQLCipher: d490d2effe735895d2204d25a154b1e722278421
|
||||
SSKeychain: c71293fa57216a40ab06c23f4085387583293de4
|
||||
TextSecureKit: b7419cbc792e5be4cbfd93a4da340f7a51d7bc41
|
||||
TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
|
||||
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
|
||||
YapDatabase: 15b6867a07ff30eac3af28794cd2262b4d0ca4ca
|
||||
|
|
|
@ -5,12 +5,14 @@
|
|||
},
|
||||
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
|
||||
"5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
|
||||
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0
|
||||
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
|
||||
"D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0
|
||||
},
|
||||
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
|
||||
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
|
||||
"5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
|
||||
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/"
|
||||
"37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/",
|
||||
"D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
|
||||
},
|
||||
"DVTSourceControlWorkspaceBlueprintNameKey" : "Signal",
|
||||
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
|
||||
|
@ -25,6 +27,11 @@
|
|||
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/Signal-iOS.git",
|
||||
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
|
||||
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C"
|
||||
},
|
||||
{
|
||||
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/FredericJacobs\/Precompiled-Signal-Dependencies.git",
|
||||
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
|
||||
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D74FB800F048CB516BB4BC70047F7CC676D291B9"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
#import <AddressBook/AddressBook.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <TextSecureKit/TSCall.h>
|
||||
#import <SignalServiceKit/TSCall.h>
|
||||
#import "Contact.h"
|
||||
#import "ContactsManager.h"
|
||||
#import "PhoneNumber.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#import <TextSecureKit/TextSecureKitEnv.h>
|
||||
#import <SignalServiceKit/TextSecureKitEnv.h>
|
||||
#import "NotificationsManager.h"
|
||||
#import "RecentCallManager.h"
|
||||
#import "TSCall.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#import <Contacts/Contacts.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <TextSecureKit/ContactsManagerProtocol.h>
|
||||
#import <TextSecureKit/PhoneNumber.h>
|
||||
#import <SignalServiceKit/ContactsManagerProtocol.h>
|
||||
#import <SignalServiceKit/PhoneNumber.h>
|
||||
#import "CollapsingFutures.h"
|
||||
#import "Contact.h"
|
||||
#import "ObservableValue.h"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <TextSecureKit/NotificationsProtocol.h>
|
||||
#import <SignalServiceKit/NotificationsProtocol.h>
|
||||
|
||||
@class TSCall;
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
//
|
||||
|
||||
#import <AudioToolbox/AudioServices.h>
|
||||
#import <TextSecureKit/TSCall.h>
|
||||
#import <TextSecureKit/TSContactThread.h>
|
||||
#import <TextSecureKit/TSErrorMessage.h>
|
||||
#import <TextSecureKit/TSIncomingMessage.h>
|
||||
#import <TextSecureKit/TextSecureKitEnv.h>
|
||||
#import <SignalServiceKit/TSCall.h>
|
||||
#import <SignalServiceKit/TSContactThread.h>
|
||||
#import <SignalServiceKit/TSErrorMessage.h>
|
||||
#import <SignalServiceKit/TSIncomingMessage.h>
|
||||
#import <SignalServiceKit/TextSecureKitEnv.h>
|
||||
#import "Environment.h"
|
||||
#import "NotificationsManager.h"
|
||||
#import "PreferencesUtil.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <TextSecureKit/TSAccountManager.h>
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import "Constraints.h"
|
||||
#import "CryptoTools.h"
|
||||
#import "NSData+ows_StripToken.h"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
//
|
||||
|
||||
#import <Mantle/Mantle.h>
|
||||
#import <TextSecureKit/NSData+Base64.h>
|
||||
#import <SignalServiceKit/NSData+Base64.h>
|
||||
#import "ArrayUtil.h"
|
||||
#import "DataUtil.h"
|
||||
#import "RPAPICall.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#import "SignalUtil.h"
|
||||
|
||||
#import <TextSecureKit/TSAccountManager.h>
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import "Constraints.h"
|
||||
#import "SignalKeyingStorage.h"
|
||||
#import "Util.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#import "GroupContactsResult.h"
|
||||
|
||||
#import <TextSecureKit/TSAccountManager.h>
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import "Contact.h"
|
||||
#import "ContactsManager.h"
|
||||
#import "Environment.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#import "CodeVerificationViewController.h"
|
||||
|
||||
#import <TextSecureKit/TSStorageManager+keyingMaterial.h>
|
||||
#import <SignalServiceKit/TSStorageManager+keyingMaterial.h>
|
||||
#import "ContactsManager.h"
|
||||
#import "Environment.h"
|
||||
#import "LocalizableText.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#import <AssetsLibrary/AssetsLibrary.h>
|
||||
#import <ContactsUI/CNContactViewController.h>
|
||||
#import <MobileCoreServices/UTCoreTypes.h>
|
||||
#import <TextSecureKit/TSAccountManager.h>
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import <YapDatabase/YapDatabaseView.h>
|
||||
#import "ContactsManager.h"
|
||||
#import "DJWActionSheet+OWS.h"
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
//
|
||||
|
||||
#import <MobileCoreServices/UTCoreTypes.h>
|
||||
#import <TextSecureKit/NSDate+millisecondTimeStamp.h>
|
||||
#import <TextSecureKit/TSAccountManager.h>
|
||||
#import <TextSecureKit/TSMessagesManager+attachments.h>
|
||||
#import <TextSecureKit/TSMessagesManager+sendMessages.h>
|
||||
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import <SignalServiceKit/TSMessagesManager+attachments.h>
|
||||
#import <SignalServiceKit/TSMessagesManager+sendMessages.h>
|
||||
#import "ContactsManager.h"
|
||||
#import "DJWActionSheet+OWS.h"
|
||||
#import "Environment.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#import <TextSecureKit/TSStorageManager+keyingMaterial.h>
|
||||
#import <SignalServiceKit/TSStorageManager+keyingMaterial.h>
|
||||
#import <XCTest/XCTest.h>
|
||||
#import "HttpSocket.h"
|
||||
#import "SignalKeyingStorage.h"
|
||||
|
|
Loading…
Reference in New Issue