mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
update third party dependencies
// FREEBIE
This commit is contained in:
Michael Kirk
parent
e5205ea311
commit
2e196e21c6
|
|
@ -1,2 +1,2 @@
|
||||||
github "mxcl/PromiseKit" "4.1.8"
|
|
||||||
github "TheLevelUp/ZXingObjC" "3.2.1"
|
github "TheLevelUp/ZXingObjC" "3.2.1"
|
||||||
|
github "mxcl/PromiseKit" "4.4.1"
|
||||||
|
|
|
||||||
2
Carthage
2
Carthage
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1fdc90d3116b142aa3a2607836fa6897ca3603ac
|
Subproject commit 4c73f1a2f0c0bceca7f0fb6777adb81c99ec0d4f
|
||||||
53
Gemfile.lock
53
Gemfile.lock
|
|
@ -2,19 +2,19 @@ GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
CFPropertyList (2.3.5)
|
CFPropertyList (2.3.5)
|
||||||
activesupport (4.2.9)
|
activesupport (4.2.10)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.5.1)
|
addressable (2.5.2)
|
||||||
public_suffix (~> 2.0, >= 2.0.2)
|
public_suffix (>= 2.0.2, < 4.0)
|
||||||
babosa (1.0.2)
|
babosa (1.0.2)
|
||||||
claide (1.0.2)
|
claide (1.0.2)
|
||||||
cocoapods (1.2.1)
|
cocoapods (1.3.1)
|
||||||
activesupport (>= 4.0.2, < 5)
|
activesupport (>= 4.0.2, < 5)
|
||||||
claide (>= 1.0.1, < 2.0)
|
claide (>= 1.0.2, < 2.0)
|
||||||
cocoapods-core (= 1.2.1)
|
cocoapods-core (= 1.3.1)
|
||||||
cocoapods-deintegrate (>= 1.0.1, < 2.0)
|
cocoapods-deintegrate (>= 1.0.1, < 2.0)
|
||||||
cocoapods-downloader (>= 1.1.3, < 2.0)
|
cocoapods-downloader (>= 1.1.3, < 2.0)
|
||||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||||
|
|
@ -29,9 +29,9 @@ GEM
|
||||||
molinillo (~> 0.5.7)
|
molinillo (~> 0.5.7)
|
||||||
nap (~> 1.0)
|
nap (~> 1.0)
|
||||||
ruby-macho (~> 1.1)
|
ruby-macho (~> 1.1)
|
||||||
xcodeproj (>= 1.4.4, < 2.0)
|
xcodeproj (>= 1.5.1, < 2.0)
|
||||||
cocoapods-core (1.2.1)
|
cocoapods-core (1.3.1)
|
||||||
activesupport (>= 4.0.2, < 5)
|
activesupport (>= 4.0.2, < 6)
|
||||||
fuzzy_match (~> 2.0.4)
|
fuzzy_match (~> 2.0.4)
|
||||||
nap (~> 1.0)
|
nap (~> 1.0)
|
||||||
cocoapods-deintegrate (1.0.1)
|
cocoapods-deintegrate (1.0.1)
|
||||||
|
|
@ -40,30 +40,30 @@ GEM
|
||||||
nap
|
nap
|
||||||
cocoapods-search (1.0.0)
|
cocoapods-search (1.0.0)
|
||||||
cocoapods-stats (1.0.0)
|
cocoapods-stats (1.0.0)
|
||||||
cocoapods-trunk (1.2.0)
|
cocoapods-trunk (1.3.0)
|
||||||
nap (>= 0.8, < 2.0)
|
nap (>= 0.8, < 2.0)
|
||||||
netrc (= 0.7.8)
|
netrc (~> 0.11)
|
||||||
cocoapods-try (1.1.0)
|
cocoapods-try (1.1.0)
|
||||||
colored (1.2)
|
colored (1.2)
|
||||||
colored2 (3.1.2)
|
colored2 (3.1.2)
|
||||||
commander-fastlane (4.4.5)
|
commander-fastlane (4.4.5)
|
||||||
highline (~> 1.7.2)
|
highline (~> 1.7.2)
|
||||||
declarative (0.0.9)
|
declarative (0.0.10)
|
||||||
declarative-option (0.1.0)
|
declarative-option (0.1.0)
|
||||||
domain_name (0.5.20170404)
|
domain_name (0.5.20170404)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
dotenv (2.2.1)
|
dotenv (2.2.1)
|
||||||
escape (0.0.4)
|
escape (0.0.4)
|
||||||
excon (0.57.1)
|
excon (0.59.0)
|
||||||
faraday (0.12.1)
|
faraday (0.13.1)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
faraday-cookie_jar (0.0.6)
|
faraday-cookie_jar (0.0.6)
|
||||||
faraday (>= 0.7.4)
|
faraday (>= 0.7.4)
|
||||||
http-cookie (~> 1.0.0)
|
http-cookie (~> 1.0.0)
|
||||||
faraday_middleware (0.11.0.1)
|
faraday_middleware (0.12.2)
|
||||||
faraday (>= 0.7.4, < 1.0)
|
faraday (>= 0.7.4, < 1.0)
|
||||||
fastimage (2.1.0)
|
fastimage (2.1.0)
|
||||||
fastlane (2.47.0)
|
fastlane (2.60.1)
|
||||||
CFPropertyList (>= 2.3, < 3.0.0)
|
CFPropertyList (>= 2.3, < 3.0.0)
|
||||||
addressable (>= 2.3, < 3.0.0)
|
addressable (>= 2.3, < 3.0.0)
|
||||||
babosa (>= 1.0.2, < 2.0.0)
|
babosa (>= 1.0.2, < 2.0.0)
|
||||||
|
|
@ -77,7 +77,7 @@ GEM
|
||||||
faraday_middleware (~> 0.9)
|
faraday_middleware (~> 0.9)
|
||||||
fastimage (>= 2.1.0, < 3.0.0)
|
fastimage (>= 2.1.0, < 3.0.0)
|
||||||
gh_inspector (>= 1.0.1, < 2.0.0)
|
gh_inspector (>= 1.0.1, < 2.0.0)
|
||||||
google-api-client (>= 0.12.0, < 0.13.0)
|
google-api-client (>= 0.13.1, < 0.14.0)
|
||||||
highline (>= 1.7.2, < 2.0.0)
|
highline (>= 1.7.2, < 2.0.0)
|
||||||
json (< 3.0.0)
|
json (< 3.0.0)
|
||||||
mini_magick (~> 4.5.1)
|
mini_magick (~> 4.5.1)
|
||||||
|
|
@ -85,6 +85,7 @@ GEM
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
multipart-post (~> 2.0.0)
|
multipart-post (~> 2.0.0)
|
||||||
plist (>= 3.1.0, < 4.0.0)
|
plist (>= 3.1.0, < 4.0.0)
|
||||||
|
public_suffix (~> 2.0.0)
|
||||||
rubyzip (>= 1.1.0, < 2.0.0)
|
rubyzip (>= 1.1.0, < 2.0.0)
|
||||||
security (= 0.1.3)
|
security (= 0.1.3)
|
||||||
slack-notifier (>= 1.3, < 2.0.0)
|
slack-notifier (>= 1.3, < 2.0.0)
|
||||||
|
|
@ -92,21 +93,21 @@ GEM
|
||||||
terminal-table (>= 1.4.5, < 2.0.0)
|
terminal-table (>= 1.4.5, < 2.0.0)
|
||||||
tty-screen (~> 0.5.0)
|
tty-screen (~> 0.5.0)
|
||||||
word_wrap (~> 1.0.0)
|
word_wrap (~> 1.0.0)
|
||||||
xcodeproj (>= 1.4.4, < 2.0.0)
|
xcodeproj (>= 1.5.0, < 2.0.0)
|
||||||
xcpretty (>= 0.2.4, < 1.0.0)
|
xcpretty (>= 0.2.4, < 1.0.0)
|
||||||
xcpretty-travis-formatter (>= 0.0.3)
|
xcpretty-travis-formatter (>= 0.0.3)
|
||||||
fourflusher (2.0.1)
|
fourflusher (2.0.1)
|
||||||
fuzzy_match (2.0.4)
|
fuzzy_match (2.0.4)
|
||||||
gh_inspector (1.0.3)
|
gh_inspector (1.0.3)
|
||||||
google-api-client (0.12.0)
|
google-api-client (0.13.6)
|
||||||
addressable (~> 2.5, >= 2.5.1)
|
addressable (~> 2.5, >= 2.5.1)
|
||||||
googleauth (~> 0.5)
|
googleauth (~> 0.5)
|
||||||
httpclient (>= 2.8.1, < 3.0)
|
httpclient (>= 2.8.1, < 3.0)
|
||||||
mime-types (~> 3.0)
|
mime-types (~> 3.0)
|
||||||
representable (~> 3.0)
|
representable (~> 3.0)
|
||||||
retriable (>= 2.0, < 4.0)
|
retriable (>= 2.0, < 4.0)
|
||||||
googleauth (0.5.1)
|
googleauth (0.5.3)
|
||||||
faraday (~> 0.9)
|
faraday (~> 0.12)
|
||||||
jwt (~> 1.4)
|
jwt (~> 1.4)
|
||||||
logging (~> 2.0)
|
logging (~> 2.0)
|
||||||
memoist (~> 0.12)
|
memoist (~> 0.12)
|
||||||
|
|
@ -129,14 +130,14 @@ GEM
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2016.0521)
|
||||||
mini_magick (4.5.1)
|
mini_magick (4.5.1)
|
||||||
minitest (5.10.2)
|
minitest (5.10.3)
|
||||||
molinillo (0.5.7)
|
molinillo (0.5.7)
|
||||||
multi_json (1.12.1)
|
multi_json (1.12.2)
|
||||||
multi_xml (0.6.0)
|
multi_xml (0.6.0)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
nanaimo (0.2.3)
|
nanaimo (0.2.3)
|
||||||
nap (1.1.0)
|
nap (1.1.0)
|
||||||
netrc (0.7.8)
|
netrc (0.11.0)
|
||||||
os (0.9.6)
|
os (0.9.6)
|
||||||
plist (3.3.0)
|
plist (3.3.0)
|
||||||
public_suffix (2.0.5)
|
public_suffix (2.0.5)
|
||||||
|
|
@ -144,7 +145,7 @@ GEM
|
||||||
declarative (< 0.1.0)
|
declarative (< 0.1.0)
|
||||||
declarative-option (< 0.2.0)
|
declarative-option (< 0.2.0)
|
||||||
uber (< 0.2.0)
|
uber (< 0.2.0)
|
||||||
retriable (3.0.2)
|
retriable (3.1.1)
|
||||||
rouge (2.0.7)
|
rouge (2.0.7)
|
||||||
ruby-macho (1.1.0)
|
ruby-macho (1.1.0)
|
||||||
rubyzip (1.2.1)
|
rubyzip (1.2.1)
|
||||||
|
|
@ -168,7 +169,7 @@ GEM
|
||||||
unf_ext (0.0.7.4)
|
unf_ext (0.0.7.4)
|
||||||
unicode-display_width (1.3.0)
|
unicode-display_width (1.3.0)
|
||||||
word_wrap (1.0.0)
|
word_wrap (1.0.0)
|
||||||
xcodeproj (1.5.0)
|
xcodeproj (1.5.2)
|
||||||
CFPropertyList (~> 2.3.3)
|
CFPropertyList (~> 2.3.3)
|
||||||
claide (>= 1.0.2, < 2.0)
|
claide (>= 1.0.2, < 2.0)
|
||||||
colored2 (~> 3.1)
|
colored2 (~> 3.1)
|
||||||
|
|
|
||||||
2
Podfile
2
Podfile
|
|
@ -12,7 +12,7 @@ target 'Signal' do
|
||||||
pod 'Reachability'
|
pod 'Reachability'
|
||||||
pod 'SignalServiceKit', path: '.'
|
pod 'SignalServiceKit', path: '.'
|
||||||
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
|
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
|
||||||
pod 'YYImage'
|
pod 'YYImage'
|
||||||
target 'SignalTests' do
|
target 'SignalTests' do
|
||||||
inherit! :search_paths
|
inherit! :search_paths
|
||||||
end
|
end
|
||||||
|
|
|
||||||
14
Podfile.lock
14
Podfile.lock
|
|
@ -41,9 +41,9 @@ PODS:
|
||||||
- ProtocolBuffers (1.9.11)
|
- ProtocolBuffers (1.9.11)
|
||||||
- PureLayout (3.0.2)
|
- PureLayout (3.0.2)
|
||||||
- Reachability (3.2)
|
- Reachability (3.2)
|
||||||
- SAMKeychain (1.5.2)
|
- SAMKeychain (1.5.3)
|
||||||
- SignalServiceKit (0.9.0):
|
- SignalServiceKit (0.9.0):
|
||||||
- '25519'
|
- 25519
|
||||||
- AFNetworking
|
- AFNetworking
|
||||||
- AxolotlKit
|
- AxolotlKit
|
||||||
- CocoaLumberjack
|
- CocoaLumberjack
|
||||||
|
|
@ -149,11 +149,11 @@ CHECKOUT OPTIONS:
|
||||||
:commit: b2d3c149102032a09aefbfb470885db4aa83efad
|
:commit: b2d3c149102032a09aefbfb470885db4aa83efad
|
||||||
:git: https://github.com/WhisperSystems/OpenSSL-Pod
|
:git: https://github.com/WhisperSystems/OpenSSL-Pod
|
||||||
SocketRocket:
|
SocketRocket:
|
||||||
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
|
:commit: 28035e1a98a427853e4038ff1b70479fa8374cfa
|
||||||
:git: https://github.com/facebook/SocketRocket.git
|
:git: https://github.com/facebook/SocketRocket.git
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
'25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
|
25519: dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
|
||||||
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
||||||
ATAppUpdater: a9f7027060959d47e58733d3b48f6b9a28cb8de1
|
ATAppUpdater: a9f7027060959d47e58733d3b48f6b9a28cb8de1
|
||||||
AxolotlKit: ba0ab24b879d34559a68e1270b079cc9bd7b3417
|
AxolotlKit: ba0ab24b879d34559a68e1270b079cc9bd7b3417
|
||||||
|
|
@ -167,7 +167,7 @@ SPEC CHECKSUMS:
|
||||||
ProtocolBuffers: d509225eb2ea43d9582a59e94348fcf86e2abd65
|
ProtocolBuffers: d509225eb2ea43d9582a59e94348fcf86e2abd65
|
||||||
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
|
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
|
||||||
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
|
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
|
||||||
SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
|
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
|
||||||
SignalServiceKit: bfac5572f3a1ff8a853ead9b5413274a075f3cb4
|
SignalServiceKit: bfac5572f3a1ff8a853ead9b5413274a075f3cb4
|
||||||
SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
|
SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
|
||||||
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559
|
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559
|
||||||
|
|
@ -176,6 +176,6 @@ SPEC CHECKSUMS:
|
||||||
YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
|
YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
|
||||||
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
|
||||||
|
|
||||||
PODFILE CHECKSUM: 00831faaa7677029090c311c00ceadaa44f65c0f
|
PODFILE CHECKSUM: e02f783a25dea01eb6bf5a9f125d0b1cac21f4dd
|
||||||
|
|
||||||
COCOAPODS: 1.2.1
|
COCOAPODS: 1.3.1
|
||||||
|
|
|
||||||
|
|
@ -2078,7 +2078,7 @@
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||||
showEnvVarsInLog = 0;
|
showEnvVarsInLog = 0;
|
||||||
};
|
};
|
||||||
3465F381B1856CC06933B3A8 /* [CP] Copy Pods Resources */ = {
|
3465F381B1856CC06933B3A8 /* [CP] Copy Pods Resources */ = {
|
||||||
|
|
@ -2186,7 +2186,7 @@
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||||
showEnvVarsInLog = 0;
|
showEnvVarsInLog = 0;
|
||||||
};
|
};
|
||||||
B4E9B04E862FB64FC9A8F79B /* [CP] Embed Pods Frameworks */ = {
|
B4E9B04E862FB64FC9A8F79B /* [CP] Embed Pods Frameworks */ = {
|
||||||
|
|
@ -2617,11 +2617,7 @@
|
||||||
"DEBUG=1",
|
"DEBUG=1",
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
);
|
);
|
||||||
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
|
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1 $(inherited) SSK_BUILDING_FOR_TESTS=1";
|
||||||
"DEBUG=1",
|
|
||||||
"$(inherited)",
|
|
||||||
"SSK_BUILDING_FOR_TESTS=1",
|
|
||||||
);
|
|
||||||
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
|
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
|
||||||
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
|
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
|
||||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
buildForAnalyzing = "YES">
|
buildForAnalyzing = "YES">
|
||||||
<BuildableReference
|
<BuildableReference
|
||||||
BuildableIdentifier = "primary"
|
BuildableIdentifier = "primary"
|
||||||
BlueprintIdentifier = "B7E17D7D298FB2D7A8BC6555A20B81A7"
|
BlueprintIdentifier = "A4F93E781EBD3FAB950273BEB17004E8"
|
||||||
BuildableName = "libSignalServiceKit.a"
|
BuildableName = "libSignalServiceKit.a"
|
||||||
BlueprintName = "SignalServiceKit"
|
BlueprintName = "SignalServiceKit"
|
||||||
ReferencedContainer = "container:Pods/Pods.xcodeproj">
|
ReferencedContainer = "container:Pods/Pods.xcodeproj">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue