Skip to content

Commit 0969ebf

Browse files
tsolomkotsolomko
committed
Merge branch 'hotfix-1.4.4'
2 parents 3ee55b1 + 726ce38 commit 0969ebf

9 files changed

Lines changed: 96 additions & 98 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.4.3
6+
module_version: 1.4.4
77
copyright: '© 2020 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.4.3
10+
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.4.4
1111
theme: fullwidth
1212

1313
custom_categories:

‎.travis.yml‎

Lines changed: 78 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
os: osx
77
osx_image: xcode10.1 # Swift 4.2
88
script:
9+
- swift --version
910
- swift build
1011
- swift test --filter BitByteDataTests
1112
- swift build -c release # Check Release build just in case.
@@ -14,180 +15,173 @@ jobs:
1415
os: osx
1516
osx_image: xcode10.3 # Swift 5.0
1617
script:
18+
- swift --version
1719
- swift build
1820
- swift test --filter BitByteDataTests
1921
- swift build -c release # Check Release build just in case.
22+
- xcodebuild -version
23+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
24+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
25+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
26+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
2027
- stage: test
2128
language: swift
2229
os: osx
2330
osx_image: xcode11.3 # Swift 5.1
2431
script:
32+
- swift --version
2533
- swift build
2634
- swift test --filter BitByteDataTests
2735
- swift build -c release # Check Release build just in case.
36+
- xcodebuild -version
37+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
38+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
39+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
40+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
2841
- stage: test
2942
language: swift
3043
os: osx
3144
osx_image: xcode11.4 # Swift 5.2
3245
script:
46+
- swift --version
3347
- swift build
3448
- swift test --filter BitByteDataTests
3549
- swift build -c release # Check Release build just in case.
50+
- xcodebuild -version
51+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
52+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
53+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
54+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
3655
- stage: test
37-
language: generic
38-
os: linux
39-
dist: xenial
40-
env:
41-
- SWIFT_VERSION=4.2
42-
install:
43-
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
56+
language: swift
57+
os: osx
58+
osx_image: xcode12.4 # Swift 5.3.2
4459
script:
60+
- swift --version
4561
- swift build
4662
- swift test --filter BitByteDataTests
4763
- swift build -c release # Check Release build just in case.
64+
- xcodebuild -version
65+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
66+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
67+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" clean build
68+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
4869
- stage: test
49-
language: generic
50-
os: linux
51-
dist: xenial
52-
env:
53-
- SWIFT_VERSION=5.0
54-
install:
55-
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
70+
language: swift
71+
os: osx
72+
osx_image: xcode12.5 # Swift 5.4
5673
script:
74+
- swift --version
5775
- swift build
5876
- swift test --filter BitByteDataTests
5977
- swift build -c release # Check Release build just in case.
78+
- xcodebuild -version
79+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
80+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
81+
# Since Xcode 12.5 watchos supports testing.
82+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" clean test
83+
- xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
6084
- stage: test
6185
language: generic
6286
os: linux
63-
dist: xenial
87+
dist: bionic
6488
env:
65-
- SWIFT_VERSION=5.1
89+
- SWIFT_VERSION=4.2.3
6690
install:
6791
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
6892
script:
93+
- swift --version
6994
- swift build
7095
- swift test --filter BitByteDataTests
7196
- swift build -c release # Check Release build just in case.
7297
- stage: test
7398
language: generic
7499
os: linux
75-
dist: xenial
100+
dist: bionic
76101
env:
77-
- SWIFT_VERSION=5.2
102+
- SWIFT_VERSION=5.0.3
78103
install:
79104
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
80105
script:
106+
- swift --version
81107
- swift build
82108
- swift test --filter BitByteDataTests
83109
- swift build -c release # Check Release build just in case.
84-
- stage: benchmark
85-
language: swift
86-
os: osx
87-
osx_image: xcode10.1 # Swift 4.2
88-
script:
89-
- ./benchmarks.py run
90-
- stage: benchmark
91-
language: swift
92-
os: osx
93-
osx_image: xcode10.3 # Swift 5.0
94-
script:
95-
- ./benchmarks.py run
96-
- stage: benchmark
97-
language: swift
98-
os: osx
99-
osx_image: xcode11.3 # Swift 5.1
100-
script:
101-
- ./benchmarks.py run
102-
- stage: benchmark
103-
language: swift
104-
os: osx
105-
osx_image: xcode11.4 # Swift 5.2
106-
script:
107-
- ./benchmarks.py run
108-
- stage: benchmark
109-
if: NOT (tag IS present)
110+
- stage: test
110111
language: generic
111112
os: linux
112-
dist: xenial
113+
dist: bionic
113114
env:
114-
- SWIFT_VERSION=4.2
115+
- SWIFT_VERSION=5.1.5
115116
install:
116117
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
117118
script:
118-
- ./benchmarks.py run
119-
- stage: benchmark
120-
if: NOT (tag IS present)
119+
- swift --version
120+
- swift build
121+
- swift test --filter BitByteDataTests
122+
- swift build -c release # Check Release build just in case.
123+
- stage: test
121124
language: generic
122125
os: linux
123-
dist: xenial
126+
dist: bionic
124127
env:
125-
- SWIFT_VERSION=5.0
128+
- SWIFT_VERSION=5.2.5
126129
install:
127130
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
128131
script:
129-
- ./benchmarks.py run
130-
- stage: benchmark
131-
if: NOT (tag IS present)
132+
- swift --version
133+
- swift build
134+
- swift test --filter BitByteDataTests
135+
- swift build -c release # Check Release build just in case.
136+
- stage: test
132137
language: generic
133138
os: linux
134-
dist: xenial
139+
dist: bionic
135140
env:
136-
- SWIFT_VERSION=5.1
141+
- SWIFT_VERSION=5.3.3
137142
install:
138143
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
139144
script:
140-
- ./benchmarks.py run
141-
- stage: benchmark
142-
if: NOT (tag IS present)
145+
- swift --version
146+
- swift build
147+
- swift test --filter BitByteDataTests
148+
- swift build -c release # Check Release build just in case.
149+
- stage: test
143150
language: generic
144151
os: linux
145-
dist: xenial
152+
dist: bionic
146153
env:
147-
- SWIFT_VERSION=5.2
154+
- SWIFT_VERSION=5.4
148155
install:
149156
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
150157
script:
151-
- ./benchmarks.py run
158+
- swift --version
159+
- swift build
160+
- swift test --filter BitByteDataTests
161+
- swift build -c release # Check Release build just in case.
152162
- stage: deploy
153-
if: tag IS present
163+
# Don't deploy if it is a test release.
164+
if: (tag IS present) AND (tag =~ /^\d+\.\d+\.\d+$/)
154165
language: generic
155166
os: osx
156-
osx_image: xcode11.4
167+
osx_image: xcode12
157168
env:
158169
secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
159170
addons:
160171
homebrew:
161172
packages:
162-
- carthage
163173
- sourcekitten
164174
update: true
165175
install:
166176
- gem install -N jazzy
167177
- gem update -N cocoapods
168178
before_deploy:
169-
- >
170-
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
171-
export BEFORE_DEPLOY_RUN=1;
172-
# Build Carthage archive.
173-
carthage build --no-skip-current
174-
carthage archive BitByteData
175-
# Generate documentation.
176-
sourcekitten doc --spm-module BitByteData > docs.json
177-
jazzy
178-
fi
179+
- sourcekitten doc --spm --module-name BitByteData > docs.json
180+
- jazzy
179181
deploy:
180-
- provider: releases
181-
skip_cleanup: true
182-
api_key: $GITHUB_TOKEN
183-
file: "BitByteData.framework.zip"
184-
on:
185-
tags: true
186182
- provider: pages
187-
skip_cleanup: true
188183
github_token: $GITHUB_TOKEN
189184
local_dir: docs
185+
skip_cleanup: true
190186
on:
191187
tags: true
192-
# Don't upload documentation if it is a test release.
193-
condition: $(git describe) != *"test"*

‎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.4.3"
4+
s.version = "1.4.4"
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.4.3</string>
18+
<string>1.4.4</string>
1919
<key>CFBundleVersion</key>
20-
<string>22</string>
20+
<string>23</string>
2121
<key>NSHumanReadableCopyright</key>
2222
<string>Copyright © 2020 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.4.3</string>
18+
<string>1.4.4</string>
1919
<key>CFBundleVersion</key>
20-
<string>22</string>
20+
<string>23</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.4.3</string>
18+
<string>1.4.4</string>
1919
<key>CFBundleVersion</key>
20-
<string>22</string>
20+
<string>23</string>
2121
</dict>
2222
</plist>

‎BitByteData.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
CLANG_WARN_SUSPICIOUS_MOVE = YES;
377377
CLANG_WARN_UNREACHABLE_CODE = YES;
378378
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
379-
CURRENT_PROJECT_VERSION = 22;
379+
CURRENT_PROJECT_VERSION = 23;
380380
DEBUG_INFORMATION_FORMAT = dwarf;
381381
ENABLE_STRICT_OBJC_MSGSEND = YES;
382382
ENABLE_TESTABILITY = YES;
@@ -424,7 +424,7 @@
424424
CLANG_WARN_SUSPICIOUS_MOVE = YES;
425425
CLANG_WARN_UNREACHABLE_CODE = YES;
426426
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
427-
CURRENT_PROJECT_VERSION = 22;
427+
CURRENT_PROJECT_VERSION = 23;
428428
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
429429
ENABLE_STRICT_OBJC_MSGSEND = YES;
430430
GCC_NO_COMMON_BLOCKS = YES;
@@ -454,7 +454,7 @@
454454
APPLICATION_EXTENSION_API_ONLY = YES;
455455
DEFINES_MODULE = YES;
456456
DYLIB_COMPATIBILITY_VERSION = 1;
457-
DYLIB_CURRENT_VERSION = 22;
457+
DYLIB_CURRENT_VERSION = 23;
458458
DYLIB_INSTALL_NAME_BASE = "@rpath";
459459
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
460460
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -478,7 +478,7 @@
478478
APPLICATION_EXTENSION_API_ONLY = YES;
479479
DEFINES_MODULE = YES;
480480
DYLIB_COMPATIBILITY_VERSION = 1;
481-
DYLIB_CURRENT_VERSION = 22;
481+
DYLIB_CURRENT_VERSION = 23;
482482
DYLIB_INSTALL_NAME_BASE = "@rpath";
483483
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
484484
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

‎CHANGELOG.md‎

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

3+
## 1.4.4
4+
5+
- Fixed a compilation warning about "deprecated class keyword" appearing when using Swift 5.4.
6+
37
## 1.4.3
48

59
- Fixed incompatibility with Swift Package Manager from Swift 4.2.

‎Sources/BitReader.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Foundation
77

88
/// A type that contains functions for reading `Data` bit-by-bit and byte-by-byte.
9-
public protocol BitReader: class {
9+
public protocol BitReader: AnyObject {
1010

1111
/// True, if reader's BIT pointer is aligned with the BYTE border.
1212
var isAligned: Bool { get }

0 commit comments

Comments
 (0)