Updated the Sodium dependency to use a commit hash to fix ambiguity

pull/941/head
Morgan Pretty 2 years ago
parent 81d0072a43
commit 0055f8422d

@ -11,7 +11,7 @@ pod 'xcbeautify'
# Dependencies to be included in the app and all extensions/frameworks
abstract_target 'GlobalDependencies' do
# FIXME: If https://github.com/jedisct1/swift-sodium/pull/249 gets resolved then revert this back to the standard pod
pod 'Sodium', :git => 'https://github.com/oxen-io/session-ios-swift-sodium.git', branch: 'session-build'
pod 'Sodium', :git => 'https://github.com/oxen-io/session-ios-swift-sodium.git', :commit => '310c343'
pod 'GRDB.swift/SQLCipher'
# FIXME: Would be nice to migrate from CocoaPods to SwiftPackageManager (should allow us to speed up build time), haven't gone through all of the dependencies but currently unfortunately SQLCipher doesn't support SPM (for more info see: https://github.com/sqlcipher/sqlcipher/issues/371)

@ -62,7 +62,7 @@ DEPENDENCIES:
- Reachability
- SAMKeychain
- SignalCoreKit (from `https://github.com/oxen-io/session-ios-core-kit`, branch `session-version`)
- Sodium (from `https://github.com/oxen-io/session-ios-swift-sodium.git`, branch `session-build`)
- Sodium (from `https://github.com/oxen-io/session-ios-swift-sodium.git`, commit `310c343`)
- SQLCipher (~> 4.5.3)
- SwiftProtobuf (~> 1.5.0)
- WebRTC-lib
@ -96,7 +96,7 @@ EXTERNAL SOURCES:
:branch: session-version
:git: https://github.com/oxen-io/session-ios-core-kit
Sodium:
:branch: session-build
:commit: 310c343
:git: https://github.com/oxen-io/session-ios-swift-sodium.git
YYImage:
:git: https://github.com/signalapp/YYImage
@ -109,7 +109,7 @@ CHECKOUT OPTIONS:
:commit: 4590c2737a2b5dc0ef4ace9f9019b581caccc1de
:git: https://github.com/oxen-io/session-ios-core-kit
Sodium:
:commit: 4ecfe2ddfd75e7b396c57975b4163e5c8cf4d5cc
:commit: 310c343
:git: https://github.com/oxen-io/session-ios-swift-sodium.git
YYImage:
:commit: 62a4cede20bcf31da73d18163408e46a92f171c6
@ -136,6 +136,6 @@ SPEC CHECKSUMS:
xcbeautify: 6e2f57af5c3a86d490376d5758030a8dcc201c1b
YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
PODFILE CHECKSUM: 61875903156c6d0a9bdd56cb9af69f77648f2009
PODFILE CHECKSUM: 1236ff531a234f02252bf143cec21d5e70b5dc46
COCOAPODS: 1.12.1

Loading…
Cancel
Save