Fix dependency management
This commit is contained in:
parent
ddbd2bc986
commit
0979f12bf3
4
Podfile
4
Podfile
|
@ -22,9 +22,7 @@ def shared_pods
|
|||
pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
|
||||
# pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
|
||||
|
||||
# Don't update SignalMetadataKit. There's some Loki specific stuff in there that gets overwritten otherwise.
|
||||
# FIXME: We should fork this, make it work with Cocoapods, and keep it up to date with Signal's repo.
|
||||
# pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"]
|
||||
pod 'SignalMetadataKit', git: 'https://github.com/loki-project/session-ios-metadata-kit', testspecs: ["Tests"] # Fork of SignalMetadataKit
|
||||
# pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
|
||||
|
||||
pod 'SignalServiceKit', path: '.', testspecs: ["Tests"] # TODO: Signal moved this into the main repo. We should probably do the same eventually.
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
#
|
||||
# Be sure to run `pod lib lint SignalServiceKit.podspec' to ensure this is a
|
||||
# valid spec before submitting.
|
||||
#
|
||||
# Any lines starting with a # are optional, but their use is encouraged
|
||||
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
|
||||
#
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SignalServiceKit"
|
||||
s.version = "0.9.0"
|
||||
s.summary = "An Objective-C library for communicating with the Signal messaging service."
|
||||
|
||||
s.description = <<-DESC
|
||||
An Objective-C library for communicating with the Signal messaging service.
|
||||
DESC
|
||||
|
||||
s.homepage = "https://github.com/signalapp/SignalServiceKit"
|
||||
s.license = 'GPLv3'
|
||||
s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" }
|
||||
s.source = { :git => "https://github.com/signalapp/SignalServiceKit.git", :tag => s.version.to_s }
|
||||
s.social_media_url = 'https://twitter.com/FredericJacobs'
|
||||
|
||||
s.platform = :ios, '10.0'
|
||||
#s.ios.deployment_target = '9.0'
|
||||
#s.osx.deployment_target = '10.9'
|
||||
s.requires_arc = true
|
||||
s.source_files = 'SignalServiceKit/src/**/*.{h,m,mm,swift}'
|
||||
|
||||
# We want to use modules to avoid clobbering CocoaLumberjack macros defined
|
||||
# by other OWS modules which *also* import CocoaLumberjack. But because we
|
||||
# also use Objective-C++, modules are disabled unless we explicitly enable
|
||||
# them
|
||||
s.compiler_flags = "-fcxx-modules"
|
||||
|
||||
s.prefix_header_file = 'SignalServiceKit/src/TSPrefix.h'
|
||||
s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
|
||||
|
||||
s.resources = ["SignalServiceKit/Resources/Certificates/*", "SignalServiceKit/src/Loki/Mnemonic/*.txt"]
|
||||
|
||||
s.dependency 'Curve25519Kit'
|
||||
s.dependency 'CocoaLumberjack'
|
||||
s.dependency 'CryptoSwift'
|
||||
s.dependency 'AFNetworking'
|
||||
s.dependency 'AxolotlKit'
|
||||
s.dependency 'Mantle'
|
||||
s.dependency 'YapDatabase/SQLCipher'
|
||||
s.dependency 'Starscream'
|
||||
s.dependency 'libPhoneNumber-iOS'
|
||||
s.dependency 'GRKOpenSSLFramework'
|
||||
s.dependency 'SAMKeychain'
|
||||
s.dependency 'Reachability'
|
||||
s.dependency 'SwiftProtobuf'
|
||||
s.dependency 'SignalCoreKit'
|
||||
s.dependency 'SignalMetadataKit'
|
||||
|
||||
s.dependency 'PromiseKit', "~> 6.0"
|
||||
|
||||
s.test_spec 'Tests' do |test_spec|
|
||||
test_spec.source_files = 'SignalServiceKit/tests/**/*.{h,m,swift}'
|
||||
end
|
||||
end
|
|
@ -1 +1 @@
|
|||
Subproject commit 395c8752f8835fe14933b4235650521c33641289
|
||||
Subproject commit 3664ef5d588feda0b09fcaaa80eefc47f1a92d37
|
Loading…
Reference in New Issue