Skip to content

Commit c24ad85

Browse files
committed
Merge branch 'release-1.3.0' into develop
2 parents 4b3466f + 751d5f4 commit c24ad85

11 files changed

Lines changed: 39 additions & 19 deletions

.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.2.0
6+
module_version: 1.3.0
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.2.0
10+
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.3.0
1111
theme: fullwidth
1212

1313
custom_categories:

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ jobs:
2525
script:
2626
# On macOS swift test (i.e. XCTest) outputs to stderr so we need to redirect pipes.
2727
- swift test -c release -Xswiftc -enable-testing --filter BitByteDataBenchmarks 2>&1 | ./ppbenchmarks.py
28-
- language: generic
28+
- stage: benchmark
29+
if: NOT (tag IS present)
30+
language: generic
2931
os: linux
3032
dist: trusty
3133
install:

BitByteData.podspec

Lines changed: 2 additions & 2 deletions
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.2.0"
4+
s.version = "1.3.0"
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."
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.tvos.deployment_target = "9.0"
2121
s.watchos.deployment_target = "2.0"
2222

23-
s.swift_version = "4.1"
23+
s.swift_version = "4.2"
2424

2525
s.source_files = "Sources/*.swift"
2626

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.2.0</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>13</string>
20+
<string>15</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.2.0</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>13</string>
20+
<string>15</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.2.0</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>13</string>
20+
<string>15</string>
2121
</dict>
2222
</plist>

BitByteData.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = 13;
373+
CURRENT_PROJECT_VERSION = 15;
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 = 13;
419+
CURRENT_PROJECT_VERSION = 15;
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 = 13;
447+
DYLIB_CURRENT_VERSION = 15;
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 = 13;
472+
DYLIB_CURRENT_VERSION = 15;
473473
DYLIB_INSTALL_NAME_BASE = "@rpath";
474474
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
475475
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 1.3.0
4+
5+
- Updated to support Swift 4.2.
6+
- Added `advance(by:)` function to both `LsbBitReader` and `MsbBitReader`.
7+
- Added `write(unsignedNumber:bitsCount:)` function to both `LsbBitWriter` and `MsbBitWriter` (PR #1 by @cowgp).
8+
39
## 1.2.0
410

511
- Updated to support Swift 4.1.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BitByteData
22

3-
[![Swift 4.1](https://img.shields.io/badge/Swift-4.1-blue.svg)](https://developer.apple.com/swift/)
3+
[![Swift 4.2](https://img.shields.io/badge/Swift-4.2-blue.svg)](https://developer.apple.com/swift/)
44
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/BitByteData/master/LICENSE)
55
[![Build Status](https://travis-ci.org/tsolomko/BitByteData.svg?branch=develop)](https://travis-ci.org/tsolomko/BitByteData)
66

@@ -22,7 +22,7 @@ let package = Package(
2222
name: "PackageName",
2323
dependencies: [
2424
.package(url: "https://github.com/tsolomko/BitByteData.git",
25-
from: "1.2.0")
25+
from: "1.3.0")
2626
],
2727
targets: [
2828
.target(
@@ -37,13 +37,13 @@ More details you can find in [Swift Package Manager's Documentation](https://git
3737

3838
### CocoaPods
3939

40-
Add `pod 'BitByteData', '~> 1.2'` and `use_frameworks!` to your Podfile.
40+
Add `pod 'BitByteData', '~> 1.3'` and `use_frameworks!` to your Podfile.
4141

4242
To complete installation, run `pod install`.
4343

4444
### Carthage
4545

46-
Add to your Cartfile `github "tsolomko/BitByteData" ~> 1.2`.
46+
Add to your Cartfile `github "tsolomko/BitByteData" ~> 1.3`.
4747

4848
Then run `carthage update`.
4949

Sources/LsbBitReader.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ public final class LsbBitReader: ByteReader, BitReader {
4242
self.offset = byteReader.offset
4343
}
4444

45+
/**
46+
Advances reader's BIT pointer by specified amount of bits (default is 1).
47+
48+
- Warning: Doesn't check if there is any data left. It is advised to use `isFinished` AFTER calling this method
49+
to check if the end was reached.
50+
*/
4551
public func advance(by count: Int = 1) {
4652
for _ in 0..<count {
4753
if self.bitMask == 128 {

0 commit comments

Comments
 (0)