diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..518eeb54c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: objective-c + +osx_image: xcode7.1 +xcode_sdk: iphonesimulator9.1 +env: + - TEST_DIR=Example/TSKitiOSTestApp + +before_install: + - cd $TEST_DIR + - brew update + - brew uninstall xctool && brew install --HEAD xctool + +install: travis_wait 30 pod install + +xcode_workspace: TSKitiOSTestApp.xcworkspace +xcode_scheme: TSKitiOSTestApp + +before_script: pwd + diff --git a/Example/TSKitOSXTestApp/Podfile b/Example/TSKitOSXTestApp/Podfile index ee4f7f191..84d5a9f1c 100644 --- a/Example/TSKitOSXTestApp/Podfile +++ b/Example/TSKitOSXTestApp/Podfile @@ -4,7 +4,7 @@ # use_frameworks! link_with 'TSKitOSXTestApp', 'TSKitOSXTestAppTests' -pod 'TextSecureKit', :path => '../../TextSecureKit.podspec' +pod 'SignalServiceKit', :path => '../../SignalServiceKit.podspec' target 'TSKitOSXTestApp' do diff --git a/Example/TSKitiOSTestApp/Podfile b/Example/TSKitiOSTestApp/Podfile index b7b46f7a6..e4e2b94fc 100644 --- a/Example/TSKitiOSTestApp/Podfile +++ b/Example/TSKitiOSTestApp/Podfile @@ -1,10 +1,10 @@ # Uncomment this line to define a global platform for your project # platform :ios, '8.0' # Uncomment this line if you're using Swift - use_frameworks! +# use_frameworks! link_with 'TSKitiOSTestApp', 'TSKitiOSTestAppTests' -pod 'TextSecureKit', :path => '../../TextSecureKit.podspec' +pod 'SignalServiceKit', :path => '../../SignalServiceKit.podspec' target 'TSKitiOSTestApp' do diff --git a/Example/TSKitiOSTestApp/Podfile.lock b/Example/TSKitiOSTestApp/Podfile.lock index fc99c597f..368d31714 100644 --- a/Example/TSKitiOSTestApp/Podfile.lock +++ b/Example/TSKitiOSTestApp/Podfile.lock @@ -1,19 +1,19 @@ PODS: - 25519 (2.0.2) - - AFNetworking (3.0.4): - - AFNetworking/NSURLSession (= 3.0.4) - - AFNetworking/Reachability (= 3.0.4) - - AFNetworking/Security (= 3.0.4) - - AFNetworking/Serialization (= 3.0.4) - - AFNetworking/UIKit (= 3.0.4) - - AFNetworking/NSURLSession (3.0.4): + - AFNetworking (3.1.0): + - AFNetworking/NSURLSession (= 3.1.0) + - AFNetworking/Reachability (= 3.1.0) + - AFNetworking/Security (= 3.1.0) + - AFNetworking/Serialization (= 3.1.0) + - AFNetworking/UIKit (= 3.1.0) + - AFNetworking/NSURLSession (3.1.0): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (3.0.4) - - AFNetworking/Security (3.0.4) - - AFNetworking/Serialization (3.0.4) - - AFNetworking/UIKit (3.0.4): + - AFNetworking/Reachability (3.1.0) + - AFNetworking/Security (3.1.0) + - AFNetworking/Serialization (3.1.0) + - AFNetworking/UIKit (3.1.0): - AFNetworking/NSURLSession - AxolotlKit (0.8): - 25519 (~> 2.0.1) @@ -29,16 +29,12 @@ PODS: - CocoaLumberjack/Default - HKDFKit (0.0.3) - libPhoneNumber-iOS (0.8.11) - - Mantle (2.0.6): - - Mantle/extobjc (= 2.0.6) - - Mantle/extobjc (2.0.6) + - Mantle (2.0.7): + - Mantle/extobjc (= 2.0.7) + - Mantle/extobjc (2.0.7) - ProtocolBuffers (1.9.10) - - 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): + - Reachability (3.2) + - SignalServiceKit (0.0.4): - '25519' - AFNetworking - AxolotlKit @@ -49,74 +45,87 @@ PODS: - SSKeychain - TwistedOakCollapsingFutures - YapDatabase/SQLCipher + - SocketRocket-PinningPolicy (0.4.3) + - SQLCipher/common (3.4.0) + - SQLCipher/fts (3.4.0): + - SQLCipher/common + - SSKeychain (1.4.0) - TwistedOakCollapsingFutures (1.0.0): - UnionFind (~> 1.0) - UnionFind (1.0.1) - - YapDatabase/SQLCipher (2.8.3): - - YapDatabase/SQLCipher/Core (= 2.8.3) - - YapDatabase/SQLCipher/Extensions (= 2.8.3) - - YapDatabase/SQLCipher/Core (2.8.3): + - YapDatabase/SQLCipher (2.9): + - YapDatabase/SQLCipher/Core (= 2.9) + - YapDatabase/SQLCipher/Extensions (= 2.9) + - YapDatabase/SQLCipher/Core (2.9): - CocoaLumberjack (~> 2) - SQLCipher/fts - - YapDatabase/SQLCipher/Extensions (2.8.3): + - YapDatabase/SQLCipher/Extensions (2.9): + - YapDatabase/SQLCipher/Core + - YapDatabase/SQLCipher/Extensions/ActionManager (= 2.9) + - YapDatabase/SQLCipher/Extensions/CloudKit (= 2.9) + - YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 2.9) + - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 2.9) + - YapDatabase/SQLCipher/Extensions/FilteredViews (= 2.9) + - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 2.9) + - YapDatabase/SQLCipher/Extensions/Hooks (= 2.9) + - YapDatabase/SQLCipher/Extensions/Relationships (= 2.9) + - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 2.9) + - YapDatabase/SQLCipher/Extensions/SearchResults (= 2.9) + - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.9) + - YapDatabase/SQLCipher/Extensions/Views (= 2.9) + - YapDatabase/SQLCipher/Extensions/ActionManager (2.9): + - Reachability (~> 3) + - YapDatabase/SQLCipher/Core + - YapDatabase/SQLCipher/Extensions/Views + - YapDatabase/SQLCipher/Extensions/CloudKit (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/CloudKit (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/FilteredViews (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/Hooks (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/Relationships (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/SearchResults (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/Views (= 2.8.3) - - YapDatabase/SQLCipher/Extensions/CloudKit (2.8.3): + - YapDatabase/SQLCipher/Extensions/ConnectionProxy (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/ConnectionProxy (2.8.3): + - YapDatabase/SQLCipher/Extensions/CrossProcessNotification (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/FilteredViews (2.8.3): + - YapDatabase/SQLCipher/Extensions/FilteredViews (2.9): - YapDatabase/SQLCipher/Core - YapDatabase/SQLCipher/Extensions/Views - - YapDatabase/SQLCipher/Extensions/FullTextSearch (2.8.3): + - YapDatabase/SQLCipher/Extensions/FullTextSearch (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/Hooks (2.8.3): + - YapDatabase/SQLCipher/Extensions/Hooks (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/Relationships (2.8.3): + - YapDatabase/SQLCipher/Extensions/Relationships (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/RTreeIndex (2.8.3): + - YapDatabase/SQLCipher/Extensions/RTreeIndex (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/SearchResults (2.8.3): + - YapDatabase/SQLCipher/Extensions/SearchResults (2.9): - YapDatabase/SQLCipher/Core - YapDatabase/SQLCipher/Extensions/FullTextSearch - YapDatabase/SQLCipher/Extensions/Views - - YapDatabase/SQLCipher/Extensions/SecondaryIndex (2.8.3): + - YapDatabase/SQLCipher/Extensions/SecondaryIndex (2.9): - YapDatabase/SQLCipher/Core - - YapDatabase/SQLCipher/Extensions/Views (2.8.3): + - YapDatabase/SQLCipher/Extensions/Views (2.9): - YapDatabase/SQLCipher/Core DEPENDENCIES: - - TextSecureKit (from `../../TextSecureKit.podspec`) + - SignalServiceKit (from `../../SignalServiceKit.podspec`) EXTERNAL SOURCES: - TextSecureKit: - :path: "../../TextSecureKit.podspec" + SignalServiceKit: + :path: "../../SignalServiceKit.podspec" SPEC CHECKSUMS: '25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc - AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93 + AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AxolotlKit: a33962f26943990e5d69d05b30470cea18caeed0 CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0 HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a libPhoneNumber-iOS: ded33fab2c51ee847979556aa504c9e70f32d703 - Mantle: 299966b00759634931699f69cb6a30b9239b944d + Mantle: bc40bb061d8c2c6fb48d5083e04d928c3b7f73d9 ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + SignalServiceKit: db7e03dbb7870f77dfa2743eb0e4926dab59d792 SocketRocket-PinningPolicy: f2ef00c3927bac05cd04d9d5171f82d922b40d3d - SQLCipher: d490d2effe735895d2204d25a154b1e722278421 + SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff SSKeychain: c71293fa57216a40ab06c23f4085387583293de4 - TextSecureKit: b7419cbc792e5be4cbfd93a4da340f7a51d7bc41 TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d - YapDatabase: 15b6867a07ff30eac3af28794cd2262b4d0ca4ca + YapDatabase: c00f4197bba2fea17bdbd82c8e8e3f7104b6fa67 COCOAPODS: 0.39.0 diff --git a/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/project.pbxproj b/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/project.pbxproj index 463f5afdd..282af5ecb 100644 --- a/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/project.pbxproj +++ b/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/project.pbxproj @@ -7,24 +7,22 @@ objects = { /* Begin PBXBuildFile section */ - 293F0028AEDFF824D7C421C1 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0323C934791C3391A2C6E5F1 /* Pods.framework */; }; - 2B6BCE46C058401C99E2F969 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0323C934791C3391A2C6E5F1 /* Pods.framework */; }; - B2136B683DE4386311D20BE4 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 45458B751CC342B600A02153 /* SignedPreKeyDeletionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */; }; + 45458B761CC342B600A02153 /* TSAttachmentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6C1CC342B600A02153 /* TSAttachmentsTest.m */; }; + 45458B771CC342B600A02153 /* TSMessageStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */; }; + 45458B781CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */; }; + 45458B791CC342B600A02153 /* TSStoragePreKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */; }; + 45458B7A1CC342B600A02153 /* TSStorageSignedPreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */; }; + 45458B7B1CC342B600A02153 /* CryptographyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B731CC342B600A02153 /* CryptographyTests.m */; }; + 45458B7C1CC342B600A02153 /* MessagePaddingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B741CC342B600A02153 /* MessagePaddingTests.m */; }; + 880BC85B411CBFE45132A8DC /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49AE9C024887F81529BCC67F /* libPods.a */; }; B6273DD61C13A2E500738558 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DD51C13A2E500738558 /* main.m */; }; B6273DD91C13A2E500738558 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DD81C13A2E500738558 /* AppDelegate.m */; }; B6273DDC1C13A2E500738558 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DDB1C13A2E500738558 /* ViewController.m */; }; B6273DDF1C13A2E500738558 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6273DDD1C13A2E500738558 /* Main.storyboard */; }; B6273DE11C13A2E500738558 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B6273DE01C13A2E500738558 /* Assets.xcassets */; }; B6273DE41C13A2E500738558 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6273DE21C13A2E500738558 /* LaunchScreen.storyboard */; }; - B6273E021C13A37600738558 /* CryptographyTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6273DF91C13A37600738558 /* CryptographyTests.mm */; }; - B6273E031C13A37600738558 /* MessagePaddingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFA1C13A37600738558 /* MessagePaddingTests.m */; }; - B6273E041C13A37600738558 /* SignedPreKeyDeletionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFB1C13A37600738558 /* SignedPreKeyDeletionTests.m */; }; - B6273E051C13A37600738558 /* TextSecureKitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFC1C13A37600738558 /* TextSecureKitTests.m */; }; - B6273E061C13A37600738558 /* TSAttachementsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFD1C13A37600738558 /* TSAttachementsTest.m */; }; - B6273E071C13A37600738558 /* TSMessageStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFE1C13A37600738558 /* TSMessageStorageTests.m */; }; - B6273E081C13A37600738558 /* TSStorageIdentityKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DFF1C13A37600738558 /* TSStorageIdentityKeyStoreTests.m */; }; - B6273E091C13A37600738558 /* TSStoragePreKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273E001C13A37600738558 /* TSStoragePreKeyStoreTests.m */; }; - B6273E0A1C13A37600738558 /* TSStorageSignedPreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273E011C13A37600738558 /* TSStorageSignedPreKeyStore.m */; }; + D0FA0139A9F66309115D43B3 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49AE9C024887F81529BCC67F /* libPods.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -38,7 +36,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0323C934791C3391A2C6E5F1 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignedPreKeyDeletionTests.m; sourceTree = ""; }; + 45458B6C1CC342B600A02153 /* TSAttachmentsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttachmentsTest.m; sourceTree = ""; }; + 45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSMessageStorageTests.m; sourceTree = ""; }; + 45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStorageIdentityKeyStoreTests.m; sourceTree = ""; }; + 45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStoragePreKeyStoreTests.m; sourceTree = ""; }; + 45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStorageSignedPreKeyStore.m; sourceTree = ""; }; + 45458B731CC342B600A02153 /* CryptographyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptographyTests.m; sourceTree = ""; }; + 45458B741CC342B600A02153 /* MessagePaddingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessagePaddingTests.m; sourceTree = ""; }; + 49AE9C024887F81529BCC67F /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; B6273DD11C13A2E500738558 /* TSKitiOSTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TSKitiOSTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; B6273DD51C13A2E500738558 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; B6273DD71C13A2E500738558 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -51,15 +57,6 @@ B6273DE51C13A2E500738558 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B6273DEA1C13A2E500738558 /* TSKitiOSTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TSKitiOSTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; B6273DF01C13A2E500738558 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B6273DF91C13A37600738558 /* CryptographyTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CryptographyTests.mm; path = ../../../tests/CryptographyTests.mm; sourceTree = ""; }; - B6273DFA1C13A37600738558 /* MessagePaddingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MessagePaddingTests.m; path = ../../../tests/MessagePaddingTests.m; sourceTree = ""; }; - B6273DFB1C13A37600738558 /* SignedPreKeyDeletionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignedPreKeyDeletionTests.m; path = ../../../tests/SignedPreKeyDeletionTests.m; sourceTree = ""; }; - B6273DFC1C13A37600738558 /* TextSecureKitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextSecureKitTests.m; path = ../../../tests/TextSecureKitTests.m; sourceTree = ""; }; - B6273DFD1C13A37600738558 /* TSAttachementsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSAttachementsTest.m; path = ../../../tests/TSAttachementsTest.m; sourceTree = ""; }; - B6273DFE1C13A37600738558 /* TSMessageStorageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSMessageStorageTests.m; path = ../../../tests/TSMessageStorageTests.m; sourceTree = ""; }; - B6273DFF1C13A37600738558 /* TSStorageIdentityKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSStorageIdentityKeyStoreTests.m; path = ../../../tests/TSStorageIdentityKeyStoreTests.m; sourceTree = ""; }; - B6273E001C13A37600738558 /* TSStoragePreKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSStoragePreKeyStoreTests.m; path = ../../../tests/TSStoragePreKeyStoreTests.m; sourceTree = ""; }; - B6273E011C13A37600738558 /* TSStorageSignedPreKeyStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSStorageSignedPreKeyStore.m; path = ../../../tests/TSStorageSignedPreKeyStore.m; sourceTree = ""; }; CA4799E963578F8A78F620D5 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; FF5DDF075DE4141C6CD4BD01 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -69,7 +66,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 293F0028AEDFF824D7C421C1 /* Pods.framework in Frameworks */, + 880BC85B411CBFE45132A8DC /* libPods.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -77,14 +74,53 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B2136B683DE4386311D20BE4 /* (null) in Frameworks */, - 2B6BCE46C058401C99E2F969 /* Pods.framework in Frameworks */, + D0FA0139A9F66309115D43B3 /* libPods.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 45458B691CC342B600A02153 /* Account */ = { + isa = PBXGroup; + children = ( + 45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */, + ); + name = Account; + path = ../../../tests/Account; + sourceTree = ""; + }; + 45458B6B1CC342B600A02153 /* Attachments */ = { + isa = PBXGroup; + children = ( + 45458B6C1CC342B600A02153 /* TSAttachmentsTest.m */, + ); + name = Attachments; + path = ../../../tests/Attachments; + sourceTree = ""; + }; + 45458B6D1CC342B600A02153 /* Storage */ = { + isa = PBXGroup; + children = ( + 45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */, + 45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */, + 45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */, + 45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */, + ); + name = Storage; + path = ../../../tests/Storage; + sourceTree = ""; + }; + 45458B721CC342B600A02153 /* Util */ = { + isa = PBXGroup; + children = ( + 45458B731CC342B600A02153 /* CryptographyTests.m */, + 45458B741CC342B600A02153 /* MessagePaddingTests.m */, + ); + name = Util; + path = ../../../tests/Util; + sourceTree = ""; + }; 8A5ED4B4EB43D7DAC1EBA16B /* Pods */ = { isa = PBXGroup; children = ( @@ -141,15 +177,10 @@ B6273DED1C13A2E500738558 /* TSKitiOSTestAppTests */ = { isa = PBXGroup; children = ( - B6273DF91C13A37600738558 /* CryptographyTests.mm */, - B6273DFA1C13A37600738558 /* MessagePaddingTests.m */, - B6273DFB1C13A37600738558 /* SignedPreKeyDeletionTests.m */, - B6273DFC1C13A37600738558 /* TextSecureKitTests.m */, - B6273DFD1C13A37600738558 /* TSAttachementsTest.m */, - B6273DFE1C13A37600738558 /* TSMessageStorageTests.m */, - B6273DFF1C13A37600738558 /* TSStorageIdentityKeyStoreTests.m */, - B6273E001C13A37600738558 /* TSStoragePreKeyStoreTests.m */, - B6273E011C13A37600738558 /* TSStorageSignedPreKeyStore.m */, + 45458B691CC342B600A02153 /* Account */, + 45458B6B1CC342B600A02153 /* Attachments */, + 45458B6D1CC342B600A02153 /* Storage */, + 45458B721CC342B600A02153 /* Util */, B6273DF01C13A2E500738558 /* Info.plist */, ); path = TSKitiOSTestAppTests; @@ -158,7 +189,7 @@ D48ED582F6D650213187ECA1 /* Frameworks */ = { isa = PBXGroup; children = ( - 0323C934791C3391A2C6E5F1 /* Pods.framework */, + 49AE9C024887F81529BCC67F /* libPods.a */, ); name = Frameworks; sourceTree = ""; @@ -372,15 +403,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B6273E071C13A37600738558 /* TSMessageStorageTests.m in Sources */, - B6273E031C13A37600738558 /* MessagePaddingTests.m in Sources */, - B6273E021C13A37600738558 /* CryptographyTests.mm in Sources */, - B6273E081C13A37600738558 /* TSStorageIdentityKeyStoreTests.m in Sources */, - B6273E051C13A37600738558 /* TextSecureKitTests.m in Sources */, - B6273E041C13A37600738558 /* SignedPreKeyDeletionTests.m in Sources */, - B6273E061C13A37600738558 /* TSAttachementsTest.m in Sources */, - B6273E0A1C13A37600738558 /* TSStorageSignedPreKeyStore.m in Sources */, - B6273E091C13A37600738558 /* TSStoragePreKeyStoreTests.m in Sources */, + 45458B781CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m in Sources */, + 45458B751CC342B600A02153 /* SignedPreKeyDeletionTests.m in Sources */, + 45458B7B1CC342B600A02153 /* CryptographyTests.m in Sources */, + 45458B791CC342B600A02153 /* TSStoragePreKeyStoreTests.m in Sources */, + 45458B761CC342B600A02153 /* TSAttachmentsTest.m in Sources */, + 45458B7A1CC342B600A02153 /* TSStorageSignedPreKeyStore.m in Sources */, + 45458B771CC342B600A02153 /* TSMessageStorageTests.m in Sources */, + 45458B7C1CC342B600A02153 /* MessagePaddingTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/xcshareddata/xcschemes/TSKitiOSTestApp.xcscheme b/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/xcshareddata/xcschemes/TSKitiOSTestApp.xcscheme new file mode 100644 index 000000000..27ef88007 --- /dev/null +++ b/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/xcshareddata/xcschemes/TSKitiOSTestApp.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index 584ef9f95..3c05a1907 100644 --- a/README.md +++ b/README.md @@ -1 +1,4 @@ # SignalServiceKit + +SignalServiceKit is an Objective-C library for communicating with the Signal +messaging service for iOS & OS X diff --git a/SignalServiceKit.podspec b/SignalServiceKit.podspec index dc2621a1e..a71d95908 100644 --- a/SignalServiceKit.podspec +++ b/SignalServiceKit.podspec @@ -1,5 +1,5 @@ # -# Be sure to run `pod lib lint TextSecureKit.podspec' to ensure this is a +# 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 @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.summary = "An Objective-C library for communicating with the Signal messaging service." s.description = <<-DESC - TextSecureKit is a library for the TextSecure protocol for iOS & OS X - DESC +An Objective-C library for communicating with the Signal messaging service. + DESC s.homepage = "https://github.com/WhisperSystems/SignalServiceKit" s.license = 'GPLv3' diff --git a/src/Messages/Attachements/TSAttachment.h b/src/Messages/Attachments/TSAttachment.h similarity index 100% rename from src/Messages/Attachements/TSAttachment.h rename to src/Messages/Attachments/TSAttachment.h diff --git a/src/Messages/Attachements/TSAttachment.m b/src/Messages/Attachments/TSAttachment.m similarity index 100% rename from src/Messages/Attachements/TSAttachment.m rename to src/Messages/Attachments/TSAttachment.m diff --git a/src/Messages/Attachements/TSAttachmentPointer.h b/src/Messages/Attachments/TSAttachmentPointer.h similarity index 100% rename from src/Messages/Attachements/TSAttachmentPointer.h rename to src/Messages/Attachments/TSAttachmentPointer.h diff --git a/src/Messages/Attachements/TSAttachmentPointer.m b/src/Messages/Attachments/TSAttachmentPointer.m similarity index 100% rename from src/Messages/Attachements/TSAttachmentPointer.m rename to src/Messages/Attachments/TSAttachmentPointer.m diff --git a/src/Messages/Attachements/TSAttachmentStream.h b/src/Messages/Attachments/TSAttachmentStream.h similarity index 100% rename from src/Messages/Attachements/TSAttachmentStream.h rename to src/Messages/Attachments/TSAttachmentStream.h diff --git a/src/Messages/Attachements/TSAttachmentStream.m b/src/Messages/Attachments/TSAttachmentStream.m similarity index 100% rename from src/Messages/Attachements/TSAttachmentStream.m rename to src/Messages/Attachments/TSAttachmentStream.m diff --git a/tests/SignedPreKeyDeletionTests.m b/tests/Account/SignedPreKeyDeletionTests.m similarity index 100% rename from tests/SignedPreKeyDeletionTests.m rename to tests/Account/SignedPreKeyDeletionTests.m diff --git a/tests/TSAttachementsTest.m b/tests/Attachments/TSAttachmentsTest.m similarity index 83% rename from tests/TSAttachementsTest.m rename to tests/Attachments/TSAttachmentsTest.m index bf7a19996..555c14382 100644 --- a/tests/TSAttachementsTest.m +++ b/tests/Attachments/TSAttachmentsTest.m @@ -11,11 +11,11 @@ #import "TSAttachmentStream.h" #import "Cryptography.h" -@interface TSAttachementsTest : XCTestCase +@interface TSAttachmentsTest : XCTestCase @end -@implementation TSAttachementsTest +@implementation TSAttachmentsTest - (void)setUp { [super setUp]; @@ -27,7 +27,7 @@ [super tearDown]; } -- (void)testAttachementEncryptionDecryption { +- (void)testAttachmentEncryptionDecryption { NSData *plaintext = [Cryptography generateRandomBytes:100]; NSString *contentType = @"img/jpg"; uint64_t identifier = 3063578577793591963; @@ -37,7 +37,7 @@ NSData *plaintextBis = [Cryptography decryptAttachment:encryptionResult.body withKey:encryptionResult.pointer.encryptionKey]; - XCTAssert([plaintext isEqualToData:plaintextBis], @"Attachements encryption failed"); + XCTAssert([plaintext isEqualToData:plaintextBis], @"Attachments encryption failed"); } @end diff --git a/tests/TSMessageStorageTests.m b/tests/Storage/TSMessageStorageTests.m similarity index 100% rename from tests/TSMessageStorageTests.m rename to tests/Storage/TSMessageStorageTests.m diff --git a/tests/TSStorageIdentityKeyStoreTests.m b/tests/Storage/TSStorageIdentityKeyStoreTests.m similarity index 100% rename from tests/TSStorageIdentityKeyStoreTests.m rename to tests/Storage/TSStorageIdentityKeyStoreTests.m diff --git a/tests/TSStoragePreKeyStoreTests.m b/tests/Storage/TSStoragePreKeyStoreTests.m similarity index 100% rename from tests/TSStoragePreKeyStoreTests.m rename to tests/Storage/TSStoragePreKeyStoreTests.m diff --git a/tests/TSStorageSignedPreKeyStore.m b/tests/Storage/TSStorageSignedPreKeyStore.m similarity index 100% rename from tests/TSStorageSignedPreKeyStore.m rename to tests/Storage/TSStorageSignedPreKeyStore.m diff --git a/tests/TextSecureKitTests.m b/tests/TextSecureKitTests.m deleted file mode 100644 index ab841ade7..000000000 --- a/tests/TextSecureKitTests.m +++ /dev/null @@ -1,28 +0,0 @@ -// -// TextSecureKitTests.m -// TextSecureKitTests -// -// Created by Frederic Jacobs on 27/10/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import - -@interface TextSecureKitTests : XCTestCase - -@end - -@implementation TextSecureKitTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - - -@end diff --git a/tests/CryptographyTests.mm b/tests/Util/CryptographyTests.m similarity index 100% rename from tests/CryptographyTests.mm rename to tests/Util/CryptographyTests.m diff --git a/tests/MessagePaddingTests.m b/tests/Util/MessagePaddingTests.m similarity index 100% rename from tests/MessagePaddingTests.m rename to tests/Util/MessagePaddingTests.m