Skip to content

Commit 2ad7644

Browse files
tsolomkotsolomko
committed
Merge branch 'develop'
2 parents 408930e + e3c0a37 commit 2ad7644

15 files changed

Lines changed: 445 additions & 298 deletions

File tree

‎.jazzy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ sourcekitten_sourcefile: docs.json
33
clean: true
44
author: Timofey Solomko
55
module: BitByteData
6-
module_version: 1.3.0
6+
module_version: 1.3.1
77
copyright: '© 2018 Timofey Solomko'
88
readme: README.md
99
github_url: https://github.com/tsolomko/BitByteData
10-
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.3.0
10+
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.3.1
1111
theme: fullwidth
1212

1313
custom_categories:

‎.swiftlint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ opt_in_rules:
1111
- explicit_init
1212
- fatal_error_message
1313
- first_where
14-
- implicit_return
1514
- implicitly_unwrapped_optional
1615
- joined_default_parameter
1716
- literal_expression_end_indentation

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
- stage: test
44
language: swift
55
os: osx
6-
osx_image: xcode10
6+
osx_image: xcode10.1
77
script:
88
- swift build
99
- swift test --filter BitByteDataTests
@@ -21,10 +21,10 @@ jobs:
2121
if: NOT (tag IS present)
2222
language: swift
2323
os: osx
24-
osx_image: xcode10
24+
osx_image: xcode10.1
2525
script:
2626
# On macOS swift test (i.e. XCTest) outputs to stderr so we need to redirect pipes.
27-
- swift test -c release -Xswiftc -enable-testing --filter BitByteDataBenchmarks 2>&1 | ./ppbenchmarks.py
27+
- swift test -c release --filter BitByteDataBenchmarks 2>&1 | ./ppbenchmarks.py
2828
- stage: benchmark
2929
if: NOT (tag IS present)
3030
language: generic
@@ -34,12 +34,12 @@ jobs:
3434
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
3535
script:
3636
# On Linux swift test outputs to stdout so we don't need to do anything.
37-
- swift test -c release -Xswiftc -enable-testing --filter BitByteDataBenchmarks | ./ppbenchmarks.py
37+
- swift test -c release --filter BitByteDataBenchmarks | ./ppbenchmarks.py
3838
- stage: deploy
3939
if: tag IS present
4040
language: generic
4141
os: osx
42-
osx_image: xcode10
42+
osx_image: xcode10.1
4343
env:
4444
secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
4545
before_install:

‎BenchmarksResults/base-swift-4.1.3.txt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
ByteReaderBenchmarks:
2+
testByte 0.201 2.320%
3+
testBytes 0.437 2.260%
4+
testIntFromBytes 0.279 1.994%
5+
testUint16 0.118 2.822%
6+
testUint16FromBytes 0.087 4.513%
7+
testUint32 0.063 7.008%
8+
testUint32FromBytes 0.064 5.787%
9+
testUint64 0.016 19.286%
10+
testUint64FromBytes 0.284 2.006%
11+
12+
LsbBitReaderBenchmarks:
13+
testAdvance 0.392 2.115%
14+
testBit 0.438 2.323%
15+
testBits 2.449 0.577%
16+
testByteFromBits 0.462 6.428%
17+
testIntFromBits 0.356 1.570%
18+
testUint16FromBits 0.453 2.737%
19+
testUint32FromBits 0.611 2.619%
20+
testUint64FromBits 0.430 1.103%
21+
22+
LsbBitWriterBenchmarks:
23+
testAppendByte 0.637 3.152%
24+
testWriteBit 0.667 2.684%
25+
testWriteNumberBitsCount 0.579 2.009%
26+
testWriteUnsignedNumberBitsCount 0.580 2.837%
27+
28+
MsbBitReaderBenchmarks:
29+
testAdvance 0.383 1.521%
30+
testBit 0.436 2.042%
31+
testBits 2.205 0.947%
32+
testByteFromBits 0.478 2.226%
33+
testIntFromBits 0.384 2.409%
34+
testUint16FromBits 0.466 1.501%
35+
testUint32FromBits 0.614 1.118%
36+
testUint64FromBits 0.469 1.390%
37+
38+
MsbBitWriterBenchmarks:
39+
testAppendByte 0.636 2.373%
40+
testWriteBit 0.672 2.442%
41+
testWriteNumberBitsCount 0.578 2.008%
42+
testWriteUnsignedNumberBitsCount 0.576 2.263%

‎BenchmarksResults/base.txt‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
ByteReaderBenchmarks:
2-
testByte 0.457 2.094%
3-
testBytes 0.397 2.203%
4-
testIntFromBytes 0.417 3.351%
5-
testUint16 0.239 3.205%
6-
testUint16FromBytes 0.206 9.280%
7-
testUint32 0.122 4.881%
8-
testUint32FromBytes 0.103 3.399%
9-
testUint64 0.029 11.959%
10-
testUint64FromBytes 0.416 1.480%
2+
testByte 0.274 5.371%
3+
testBytes 0.401 4.880%
4+
testIntFromBytes 0.218 2.365%
5+
testUint16 0.199 3.142%
6+
testUint16FromBytes 0.116 3.677%
7+
testUint32 0.102 3.573%
8+
testUint32FromBytes 0.059 4.866%
9+
testUint64 0.024 8.593%
10+
testUint64FromBytes 0.215 2.504%
1111

1212
LsbBitReaderBenchmarks:
13-
testBit 2.192 10.594%
14-
testBits 3.956 0.858%
15-
testByteFromBits 0.917 1.045%
16-
testIntFromBits 0.679 1.361%
17-
testUint16FromBits 0.821 1.885%
18-
testUint32FromBits 0.993 2.142%
19-
testUint64FromBits 0.709 1.185%
13+
testAdvance 0.500 6.255%
14+
testBit 1.421 0.816%
15+
testBits 3.202 0.807%
16+
testByteFromBits 0.719 3.500%
17+
testIntFromBits 0.539 1.592%
18+
testUint16FromBits 0.664 0.930%
19+
testUint32FromBits 0.820 1.346%
20+
testUint64FromBits 0.593 2.923%
2021

2122
LsbBitWriterBenchmarks:
22-
testAppendByte 1.114 4.319%
23-
testWriteBit 1.243 1.516%
24-
testWriteNumberBitsCount 1.071 1.721%
25-
testWriteUnsignedNumberBitsCount 1.052 1.330%
23+
testAppendByte 1.075 2.339%
24+
testWriteBit 1.287 2.301%
25+
testWriteNumberBitsCount 0.977 2.017%
26+
testWriteUnsignedNumberBitsCount 1.093 2.588%
2627

2728
MsbBitReaderBenchmarks:
28-
testBit 2.088 2.183%
29-
testBits 3.952 0.516%
30-
testByteFromBits 0.944 1.012%
31-
testIntFromBits 0.689 1.355%
32-
testUint16FromBits 0.835 1.000%
33-
testUint32FromBits 1.011 0.947%
34-
testUint64FromBits 0.722 2.311%
29+
testAdvance 0.484 1.542%
30+
testBit 1.418 1.365%
31+
testBits 3.182 0.701%
32+
testByteFromBits 0.735 0.974%
33+
testIntFromBits 0.553 1.387%
34+
testUint16FromBits 0.695 1.582%
35+
testUint32FromBits 0.844 2.019%
36+
testUint64FromBits 0.603 2.789%
3537

3638
MsbBitWriterBenchmarks:
37-
testAppendByte 1.364 11.587%
38-
testWriteBit 1.301 1.769%
39-
testWriteNumberBitsCount 1.050 3.337%
40-
testWriteUnsignedNumberBitsCount 1.108 1.304%
39+
testAppendByte 1.186 2.495%
40+
testWriteBit 1.261 2.024%
41+
testWriteNumberBitsCount 1.016 1.905%
42+
testWriteUnsignedNumberBitsCount 0.985 1.381%

‎BitByteData.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "BitByteData"
4-
s.version = "1.3.0"
4+
s.version = "1.3.1"
55
s.summary = "Read and write bits and bytes in Swift."
66

77
s.description = "A Swift framework with classes for reading and writing bits and bytes."

‎BitByteData.xcodeproj/BitByteData.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.0</string>
18+
<string>1.3.1</string>
1919
<key>CFBundleVersion</key>
20-
<string>15</string>
20+
<string>16</string>
2121
<key>NSHumanReadableCopyright</key>
2222
<string>Copyright © 2018 Timofey Solomko. All rights reserved.</string>
2323
</dict>

‎BitByteData.xcodeproj/BitByteDataBenchmarks.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.0</string>
18+
<string>1.3.1</string>
1919
<key>CFBundleVersion</key>
20-
<string>15</string>
20+
<string>16</string>
2121
</dict>
2222
</plist>

‎BitByteData.xcodeproj/TestBitByteData.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.0</string>
18+
<string>1.3.1</string>
1919
<key>CFBundleVersion</key>
20-
<string>15</string>
20+
<string>16</string>
2121
</dict>
2222
</plist>

‎BitByteData.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
060F68322176024400688683 /* LsbBitReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060F68312176024400688683 /* LsbBitReaderBenchmarks.swift */; };
11-
060F6834217604E800688683 /* MsbBitReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060F6833217604E800688683 /* MsbBitReaderBenchmarks.swift */; };
1210
065DD5E421673BC100704028 /* BitByteData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06F0656C1FFAEA4B00312A82 /* BitByteData.framework */; };
13-
06A81B0F2177947600B6B7BB /* LsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B0E2177947600B6B7BB /* LsbBitWriterBenchmarks.swift */; };
14-
06A81B112177955600B6B7BB /* MsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B102177955500B6B7BB /* MsbBitWriterBenchmarks.swift */; };
15-
06ADF4CB214BB86600B8F0E9 /* ByteReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06ADF4CA214BB86600B8F0E9 /* ByteReaderBenchmarks.swift */; };
1611
06F065751FFAEA8700312A82 /* LsbBitReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065571FFAEA1F00312A82 /* LsbBitReader.swift */; };
1712
06F065761FFAEA8700312A82 /* BitReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065581FFAEA1F00312A82 /* BitReader.swift */; };
1813
06F065771FFAEA8700312A82 /* ByteReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065591FFAEA1F00312A82 /* ByteReader.swift */; };
@@ -27,6 +22,11 @@
2722
06F0658E1FFAEAA900312A82 /* LsbBitWriterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065641FFAEA1F00312A82 /* LsbBitWriterTests.swift */; };
2823
06F0658F1FFAEAA900312A82 /* LsbBitReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065651FFAEA1F00312A82 /* LsbBitReaderTests.swift */; };
2924
06F065901FFAEAA900312A82 /* ByteReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F065661FFAEA1F00312A82 /* ByteReaderTests.swift */; };
25+
06FA0DC121935115009B4DEB /* ByteReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06ADF4CA214BB86600B8F0E9 /* ByteReaderBenchmarks.swift */; };
26+
06FA0DC221935115009B4DEB /* LsbBitReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060F68312176024400688683 /* LsbBitReaderBenchmarks.swift */; };
27+
06FA0DC321935115009B4DEB /* MsbBitReaderBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060F6833217604E800688683 /* MsbBitReaderBenchmarks.swift */; };
28+
06FA0DC421935115009B4DEB /* LsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B0E2177947600B6B7BB /* LsbBitWriterBenchmarks.swift */; };
29+
06FA0DC521935115009B4DEB /* MsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B102177955500B6B7BB /* MsbBitWriterBenchmarks.swift */; };
3030
/* End PBXBuildFile section */
3131

3232
/* Begin PBXContainerItemProxy section */
@@ -261,6 +261,11 @@
261261
isa = PBXSourcesBuildPhase;
262262
buildActionMask = 2147483647;
263263
files = (
264+
06FA0DC521935115009B4DEB /* MsbBitWriterBenchmarks.swift in Sources */,
265+
06FA0DC221935115009B4DEB /* LsbBitReaderBenchmarks.swift in Sources */,
266+
06FA0DC121935115009B4DEB /* ByteReaderBenchmarks.swift in Sources */,
267+
06FA0DC421935115009B4DEB /* LsbBitWriterBenchmarks.swift in Sources */,
268+
06FA0DC321935115009B4DEB /* MsbBitReaderBenchmarks.swift in Sources */,
264269
);
265270
runOnlyForDeploymentPostprocessing = 0;
266271
};
@@ -283,16 +288,11 @@
283288
isa = PBXSourcesBuildPhase;
284289
buildActionMask = 2147483647;
285290
files = (
286-
06A81B112177955600B6B7BB /* MsbBitWriterBenchmarks.swift in Sources */,
287-
060F6834217604E800688683 /* MsbBitReaderBenchmarks.swift in Sources */,
288-
06ADF4CB214BB86600B8F0E9 /* ByteReaderBenchmarks.swift in Sources */,
289291
06F0658F1FFAEAA900312A82 /* LsbBitReaderTests.swift in Sources */,
290292
06F065901FFAEAA900312A82 /* ByteReaderTests.swift in Sources */,
291293
06F0658C1FFAEAA900312A82 /* MsbBitWriterTests.swift in Sources */,
292294
06F0658E1FFAEAA900312A82 /* LsbBitWriterTests.swift in Sources */,
293295
06F0658D1FFAEAA900312A82 /* MsbBitReaderTests.swift in Sources */,
294-
06A81B0F2177947600B6B7BB /* LsbBitWriterBenchmarks.swift in Sources */,
295-
060F68322176024400688683 /* LsbBitReaderBenchmarks.swift in Sources */,
296296
);
297297
runOnlyForDeploymentPostprocessing = 0;
298298
};
@@ -370,7 +370,7 @@
370370
CLANG_WARN_SUSPICIOUS_MOVE = YES;
371371
CLANG_WARN_UNREACHABLE_CODE = YES;
372372
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
373-
CURRENT_PROJECT_VERSION = 15;
373+
CURRENT_PROJECT_VERSION = 16;
374374
DEBUG_INFORMATION_FORMAT = dwarf;
375375
ENABLE_STRICT_OBJC_MSGSEND = YES;
376376
ENABLE_TESTABILITY = YES;
@@ -416,7 +416,7 @@
416416
CLANG_WARN_SUSPICIOUS_MOVE = YES;
417417
CLANG_WARN_UNREACHABLE_CODE = YES;
418418
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
419-
CURRENT_PROJECT_VERSION = 15;
419+
CURRENT_PROJECT_VERSION = 16;
420420
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
421421
ENABLE_STRICT_OBJC_MSGSEND = YES;
422422
GCC_NO_COMMON_BLOCKS = YES;
@@ -444,7 +444,7 @@
444444
APPLICATION_EXTENSION_API_ONLY = YES;
445445
DEFINES_MODULE = YES;
446446
DYLIB_COMPATIBILITY_VERSION = 1;
447-
DYLIB_CURRENT_VERSION = 15;
447+
DYLIB_CURRENT_VERSION = 16;
448448
DYLIB_INSTALL_NAME_BASE = "@rpath";
449449
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
450450
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -469,7 +469,7 @@
469469
APPLICATION_EXTENSION_API_ONLY = YES;
470470
DEFINES_MODULE = YES;
471471
DYLIB_COMPATIBILITY_VERSION = 1;
472-
DYLIB_CURRENT_VERSION = 15;
472+
DYLIB_CURRENT_VERSION = 16;
473473
DYLIB_INSTALL_NAME_BASE = "@rpath";
474474
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
475475
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

0 commit comments

Comments
 (0)