Skip to content

Commit da9eeaa

Browse files
Update tests
1 parent 46f4e9e commit da9eeaa

File tree

8 files changed

+109
-62
lines changed

8 files changed

+109
-62
lines changed

Tests/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22

3-
gem "cocoapods", "1.2.0"
3+
gem 'cocoapods', '~> 1.5.0'

Tests/Gemfile.lock

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,76 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.5)
5-
activesupport (4.2.8)
4+
CFPropertyList (3.0.0)
5+
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
claide (1.0.1)
11-
cocoapods (1.2.0)
10+
atomos (0.1.2)
11+
claide (1.0.2)
12+
cocoapods (1.5.3)
1213
activesupport (>= 4.0.2, < 5)
13-
claide (>= 1.0.1, < 2.0)
14-
cocoapods-core (= 1.2.0)
15-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16-
cocoapods-downloader (>= 1.1.3, < 2.0)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.5.3)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.2.0, < 2.0)
1718
cocoapods-plugins (>= 1.0.0, < 2.0)
1819
cocoapods-search (>= 1.0.0, < 2.0)
1920
cocoapods-stats (>= 1.0.0, < 2.0)
20-
cocoapods-trunk (>= 1.1.2, < 2.0)
21+
cocoapods-trunk (>= 1.3.0, < 2.0)
2122
cocoapods-try (>= 1.1.0, < 2.0)
22-
colored (~> 1.2)
23+
colored2 (~> 3.1)
2324
escape (~> 0.0.4)
2425
fourflusher (~> 2.0.1)
2526
gh_inspector (~> 1.0)
26-
molinillo (~> 0.5.5)
27+
molinillo (~> 0.6.5)
2728
nap (~> 1.0)
28-
ruby-macho (~> 0.2.5)
29-
xcodeproj (>= 1.4.1, < 2.0)
30-
cocoapods-core (1.2.0)
31-
activesupport (>= 4.0.2, < 5)
29+
ruby-macho (~> 1.1)
30+
xcodeproj (>= 1.5.7, < 2.0)
31+
cocoapods-core (1.5.3)
32+
activesupport (>= 4.0.2, < 6)
3233
fuzzy_match (~> 2.0.4)
3334
nap (~> 1.0)
34-
cocoapods-deintegrate (1.0.1)
35-
cocoapods-downloader (1.1.3)
35+
cocoapods-deintegrate (1.0.2)
36+
cocoapods-downloader (1.2.1)
3637
cocoapods-plugins (1.0.0)
3738
nap
3839
cocoapods-search (1.0.0)
3940
cocoapods-stats (1.0.0)
40-
cocoapods-trunk (1.1.2)
41+
cocoapods-trunk (1.3.0)
4142
nap (>= 0.8, < 2.0)
42-
netrc (= 0.7.8)
43+
netrc (~> 0.11)
4344
cocoapods-try (1.1.0)
44-
colored (1.2)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.0.5)
4547
escape (0.0.4)
4648
fourflusher (2.0.1)
4749
fuzzy_match (2.0.4)
48-
gh_inspector (1.0.3)
49-
i18n (0.8.1)
50-
minitest (5.10.1)
51-
molinillo (0.5.6)
52-
nanaimo (0.2.3)
50+
gh_inspector (1.1.3)
51+
i18n (0.9.5)
52+
concurrent-ruby (~> 1.0)
53+
minitest (5.11.3)
54+
molinillo (0.6.5)
55+
nanaimo (0.2.5)
5356
nap (1.1.0)
54-
netrc (0.7.8)
55-
ruby-macho (0.2.6)
56-
thread_safe (0.3.5)
57-
tzinfo (1.2.2)
57+
netrc (0.11.0)
58+
ruby-macho (1.1.0)
59+
thread_safe (0.3.6)
60+
tzinfo (1.2.5)
5861
thread_safe (~> 0.1)
59-
xcodeproj (1.4.2)
60-
CFPropertyList (~> 2.3.3)
61-
activesupport (>= 3)
62-
claide (>= 1.0.1, < 2.0)
63-
colored (~> 1.2)
64-
nanaimo (~> 0.2.3)
62+
xcodeproj (1.5.9)
63+
CFPropertyList (>= 2.3.3, < 4.0)
64+
atomos (~> 0.1.2)
65+
claide (>= 1.0.2, < 2.0)
66+
colored2 (~> 3.1)
67+
nanaimo (~> 0.2.5)
6568

6669
PLATFORMS
6770
ruby
6871

6972
DEPENDENCIES
70-
cocoapods (= 1.2.0)
73+
cocoapods (~> 1.5.0)
7174

7275
BUNDLED WITH
73-
1.13.7
76+
1.16.1

Tests/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- SignalProtocolC (2.3.1)
2+
- SignalProtocolC (2.3.2)
33

44
DEPENDENCIES:
55
- SignalProtocolC (from `../SignalProtocolC.podspec`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:podspec: "../SignalProtocolC.podspec"
1010

1111
SPEC CHECKSUMS:
12-
SignalProtocolC: 510c0b566579cfc70fd2166a60290e96f2367137
12+
SignalProtocolC: 051512e9f3abfeb4120c5e9673af9ae0ee370070
1313

1414
PODFILE CHECKSUM: 371150e42b2dd47483d342f5353e1de447285640
1515

16-
COCOAPODS: 1.2.0
16+
COCOAPODS: 1.5.3

Tests/libsignal-protocol-c.xcodeproj/project.pbxproj

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXContainerItemProxy section */
19+
D907111620C656050034BF4F /* PBXContainerItemProxy */ = {
20+
isa = PBXContainerItemProxy;
21+
containerPortal = D92D742F1E8D978B00B478E8 /* SignalProtocolC.xcodeproj */;
22+
proxyType = 2;
23+
remoteGlobalIDString = CEF63B542049747B00227B9D;
24+
remoteInfo = "SignalProtocolC (tvOS)";
25+
};
26+
D907111820C656050034BF4F /* PBXContainerItemProxy */ = {
27+
isa = PBXContainerItemProxy;
28+
containerPortal = D92D742F1E8D978B00B478E8 /* SignalProtocolC.xcodeproj */;
29+
proxyType = 2;
30+
remoteGlobalIDString = CEF63B61204974B100227B9D;
31+
remoteInfo = "SignalProtocolC (watchOS)";
32+
};
1933
D92D74341E8D978B00B478E8 /* PBXContainerItemProxy */ = {
2034
isa = PBXContainerItemProxy;
2135
containerPortal = D92D742F1E8D978B00B478E8 /* SignalProtocolC.xcodeproj */;
@@ -108,6 +122,8 @@
108122
children = (
109123
D92D74351E8D978B00B478E8 /* SignalProtocolC.framework */,
110124
D92D74371E8D978B00B478E8 /* SignalProtocolC.framework */,
125+
D907111720C656050034BF4F /* SignalProtocolC.framework */,
126+
D907111920C656050034BF4F /* SignalProtocolC.framework */,
111127
);
112128
name = Products;
113129
sourceTree = "<group>";
@@ -190,7 +206,6 @@
190206
D9CC4ABD1D1EF7B600C327E5 /* Frameworks */,
191207
D9CC4ABE1D1EF7B600C327E5 /* Resources */,
192208
0E4BA9F0B2D22A4DB58387CA /* [CP] Embed Pods Frameworks */,
193-
A4E4984C540B3A3DA28C129E /* [CP] Copy Pods Resources */,
194209
);
195210
buildRules = (
196211
);
@@ -207,7 +222,7 @@
207222
D9CC4AB61D1EF77600C327E5 /* Project object */ = {
208223
isa = PBXProject;
209224
attributes = {
210-
LastUpgradeCheck = 0800;
225+
LastUpgradeCheck = 0940;
211226
TargetAttributes = {
212227
D92D74251E8D96FC00B478E8 = {
213228
CreatedOnToolsVersion = 8.3;
@@ -248,6 +263,20 @@
248263
/* End PBXProject section */
249264

250265
/* Begin PBXReferenceProxy section */
266+
D907111720C656050034BF4F /* SignalProtocolC.framework */ = {
267+
isa = PBXReferenceProxy;
268+
fileType = wrapper.framework;
269+
path = SignalProtocolC.framework;
270+
remoteRef = D907111620C656050034BF4F /* PBXContainerItemProxy */;
271+
sourceTree = BUILT_PRODUCTS_DIR;
272+
};
273+
D907111920C656050034BF4F /* SignalProtocolC.framework */ = {
274+
isa = PBXReferenceProxy;
275+
fileType = wrapper.framework;
276+
path = SignalProtocolC.framework;
277+
remoteRef = D907111820C656050034BF4F /* PBXContainerItemProxy */;
278+
sourceTree = BUILT_PRODUCTS_DIR;
279+
};
251280
D92D74351E8D978B00B478E8 /* SignalProtocolC.framework */ = {
252281
isa = PBXReferenceProxy;
253282
fileType = wrapper.framework;
@@ -295,9 +324,12 @@
295324
files = (
296325
);
297326
inputPaths = (
327+
"${SRCROOT}/Pods/Target Support Files/Pods-Tests-Pods-macOS/Pods-Tests-Pods-macOS-frameworks.sh",
328+
"${BUILT_PRODUCTS_DIR}/SignalProtocolC/SignalProtocolC.framework",
298329
);
299330
name = "[CP] Embed Pods Frameworks";
300331
outputPaths = (
332+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SignalProtocolC.framework",
301333
);
302334
runOnlyForDeploymentPostprocessing = 0;
303335
shellPath = /bin/sh;
@@ -310,28 +342,16 @@
310342
files = (
311343
);
312344
inputPaths = (
345+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
346+
"${PODS_ROOT}/Manifest.lock",
313347
);
314348
name = "[CP] Check Pods Manifest.lock";
315349
outputPaths = (
350+
"$(DERIVED_FILE_DIR)/Pods-Tests-Pods-macOS-checkManifestLockResult.txt",
316351
);
317352
runOnlyForDeploymentPostprocessing = 0;
318353
shellPath = /bin/sh;
319-
shellScript = "diff \"${PODS_ROOT}/../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";
320-
showEnvVarsInLog = 0;
321-
};
322-
A4E4984C540B3A3DA28C129E /* [CP] Copy Pods Resources */ = {
323-
isa = PBXShellScriptBuildPhase;
324-
buildActionMask = 2147483647;
325-
files = (
326-
);
327-
inputPaths = (
328-
);
329-
name = "[CP] Copy Pods Resources";
330-
outputPaths = (
331-
);
332-
runOnlyForDeploymentPostprocessing = 0;
333-
shellPath = /bin/sh;
334-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests-Pods-macOS/Pods-Tests-Pods-macOS-resources.sh\"\n";
354+
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";
335355
showEnvVarsInLog = 0;
336356
};
337357
/* End PBXShellScriptBuildPhase section */
@@ -517,12 +537,20 @@
517537
D9CC4ABA1D1EF77600C327E5 /* Debug */ = {
518538
isa = XCBuildConfiguration;
519539
buildSettings = {
540+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
520541
CLANG_WARN_BOOL_CONVERSION = YES;
542+
CLANG_WARN_COMMA = YES;
521543
CLANG_WARN_CONSTANT_CONVERSION = YES;
544+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
522545
CLANG_WARN_EMPTY_BODY = YES;
523546
CLANG_WARN_ENUM_CONVERSION = YES;
524547
CLANG_WARN_INFINITE_RECURSION = YES;
525548
CLANG_WARN_INT_CONVERSION = YES;
549+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
550+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
551+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
552+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
553+
CLANG_WARN_STRICT_PROTOTYPES = YES;
526554
CLANG_WARN_SUSPICIOUS_MOVE = YES;
527555
CLANG_WARN_UNREACHABLE_CODE = YES;
528556
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -542,12 +570,20 @@
542570
D9CC4ABB1D1EF77600C327E5 /* Release */ = {
543571
isa = XCBuildConfiguration;
544572
buildSettings = {
573+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
545574
CLANG_WARN_BOOL_CONVERSION = YES;
575+
CLANG_WARN_COMMA = YES;
546576
CLANG_WARN_CONSTANT_CONVERSION = YES;
577+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
547578
CLANG_WARN_EMPTY_BODY = YES;
548579
CLANG_WARN_ENUM_CONVERSION = YES;
549580
CLANG_WARN_INFINITE_RECURSION = YES;
550581
CLANG_WARN_INT_CONVERSION = YES;
582+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
583+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
584+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
585+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
586+
CLANG_WARN_STRICT_PROTOTYPES = YES;
551587
CLANG_WARN_SUSPICIOUS_MOVE = YES;
552588
CLANG_WARN_UNREACHABLE_CODE = YES;
553589
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

Tests/libsignal-protocol-c.xcodeproj/xcshareddata/xcschemes/Tests-Framework-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/libsignal-protocol-c.xcodeproj/xcshareddata/xcschemes/Tests-Framework-macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/libsignal-protocol-c.xcodeproj/xcshareddata/xcschemes/Tests-Pods-macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)