From efa303abebeb3037b37772c063ce999a164e435f Mon Sep 17 00:00:00 2001 From: Mikunj Date: Wed, 22 May 2019 09:15:52 +1000 Subject: [PATCH] Fix mnemonic languages not being linked. --- Podfile.lock | 2 +- Pods | 2 +- SignalServiceKit.podspec | 2 +- SignalServiceKit/src/Loki/Crypto/{Mnemonic => }/Mnemonic.swift | 0 SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/english.txt | 0 SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/japanese.txt | 0 SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/portuguese.txt | 0 SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/spanish.txt | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename SignalServiceKit/src/Loki/Crypto/{Mnemonic => }/Mnemonic.swift (100%) rename SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/english.txt (100%) rename SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/japanese.txt (100%) rename SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/portuguese.txt (100%) rename SignalServiceKit/src/Loki/{Crypto => }/Mnemonic/spanish.txt (100%) diff --git a/Podfile.lock b/Podfile.lock index dd272bda9..08ccc0a45 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -305,7 +305,7 @@ SPEC CHECKSUMS: SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SignalCoreKit: c2d8132cdedb95d35eb2f8ae7eac0957695d0a8b SignalMetadataKit: 6fa5e9a53c7f104568662521a2f3874672ff7a02 - SignalServiceKit: 54fde76bc75b63bd5e9088acdbd3be0ff7e154d0 + SignalServiceKit: 7f97a29c42328c02ae95f94cce08aa8bc92ab258 SQLCipher: efbdb52cdbe340bcd892b1b14297df4e07241b7f SSZipArchive: 8e859da2520142e09166bc9161967db296e9d02f Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 diff --git a/Pods b/Pods index d2c312cc2..077f345d2 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit d2c312cc2152c929ecfe4fe61ea2e7a3eef90fdf +Subproject commit 077f345d2993bf2a7dab8df935986e6495e764c7 diff --git a/SignalServiceKit.podspec b/SignalServiceKit.podspec index d70992803..7e4126d02 100644 --- a/SignalServiceKit.podspec +++ b/SignalServiceKit.podspec @@ -36,7 +36,7 @@ An Objective-C library for communicating with the Signal messaging service. s.prefix_header_file = 'SignalServiceKit/src/TSPrefix.h' s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' } - s.resources = ["SignalServiceKit/Resources/Certificates/*"] + s.resources = ["SignalServiceKit/Resources/Certificates/*", "SignalServiceKit/src/Loki/Mnemonic/*.txt"] s.dependency 'Curve25519Kit' s.dependency 'CocoaLumberjack' diff --git a/SignalServiceKit/src/Loki/Crypto/Mnemonic/Mnemonic.swift b/SignalServiceKit/src/Loki/Crypto/Mnemonic.swift similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/Mnemonic/Mnemonic.swift rename to SignalServiceKit/src/Loki/Crypto/Mnemonic.swift diff --git a/SignalServiceKit/src/Loki/Crypto/Mnemonic/english.txt b/SignalServiceKit/src/Loki/Mnemonic/english.txt similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/Mnemonic/english.txt rename to SignalServiceKit/src/Loki/Mnemonic/english.txt diff --git a/SignalServiceKit/src/Loki/Crypto/Mnemonic/japanese.txt b/SignalServiceKit/src/Loki/Mnemonic/japanese.txt similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/Mnemonic/japanese.txt rename to SignalServiceKit/src/Loki/Mnemonic/japanese.txt diff --git a/SignalServiceKit/src/Loki/Crypto/Mnemonic/portuguese.txt b/SignalServiceKit/src/Loki/Mnemonic/portuguese.txt similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/Mnemonic/portuguese.txt rename to SignalServiceKit/src/Loki/Mnemonic/portuguese.txt diff --git a/SignalServiceKit/src/Loki/Crypto/Mnemonic/spanish.txt b/SignalServiceKit/src/Loki/Mnemonic/spanish.txt similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/Mnemonic/spanish.txt rename to SignalServiceKit/src/Loki/Mnemonic/spanish.txt