Merge branch 'hotfix-1.4.4'

tsolomko · May 20, 2021 · 0969ebf · 0969ebf
2 parents 3ee55b1 + 726ce38
commit 0969ebf
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 98 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -3,11 +3,11 @@ sourcekitten_sourcefile: docs.json
 clean: true
 author: Timofey Solomko
 module: BitByteData
-module_version: 1.4.3
+module_version: 1.4.4
 copyright: '© 2020 Timofey Solomko'
 readme: README.md
 github_url: https://github.com/tsolomko/BitByteData
-github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.4.3
+github_file_prefix: https://github.com/tsolomko/BitByteData/tree/1.4.4
 theme: fullwidth
 
 custom_categories:

diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ jobs:
       os: osx
       osx_image: xcode10.1 # Swift 4.2
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
@@ -14,180 +15,173 @@ jobs:
       os: osx
       osx_image: xcode10.3 # Swift 5.0
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
+      - xcodebuild -version
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
     - stage: test
       language: swift
       os: osx
       osx_image: xcode11.3 # Swift 5.1
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
+      - xcodebuild -version
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
     - stage: test
       language: swift
       os: osx
       osx_image: xcode11.4 # Swift 5.2
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
+      - xcodebuild -version
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm" clean build
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
     - stage: test
-      language: generic
-      os: linux
-      dist: xenial
-      env:
-      - SWIFT_VERSION=4.2
-      install:
-      - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+      language: swift
+      os: osx
+      osx_image: xcode12.4 # Swift 5.3.2
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
+      - xcodebuild -version
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" clean build
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
     - stage: test
-      language: generic
-      os: linux
-      dist: xenial
-      env:
-      - SWIFT_VERSION=5.0
-      install:
-      - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+      language: swift
+      os: osx
+      osx_image: xcode12.5 # Swift 5.4
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
+      - xcodebuild -version
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=OS X" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=iOS Simulator,name=iPhone 8" clean test
+      # Since Xcode 12.5 watchos supports testing.
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" clean test
+      - xcodebuild -quiet -project BitByteData.xcodeproj -scheme BitByteData -destination "platform=tvOS Simulator,name=Apple TV" clean test
     - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=5.1
+      - SWIFT_VERSION=4.2.3
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
     - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=5.2
+      - SWIFT_VERSION=5.0.3
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
+      - swift --version
       - swift build
       - swift test --filter BitByteDataTests
       - swift build -c release # Check Release build just in case.
-    - stage: benchmark
-      language: swift
-      os: osx
-      osx_image: xcode10.1 # Swift 4.2
-      script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      language: swift
-      os: osx
-      osx_image: xcode10.3 # Swift 5.0
-      script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      language: swift
-      os: osx
-      osx_image: xcode11.3 # Swift 5.1
-      script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      language: swift
-      os: osx
-      osx_image: xcode11.4 # Swift 5.2
-      script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      if: NOT (tag IS present)
+    - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=4.2
+      - SWIFT_VERSION=5.1.5
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      if: NOT (tag IS present)
+      - swift --version
+      - swift build
+      - swift test --filter BitByteDataTests
+      - swift build -c release # Check Release build just in case.
+    - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=5.0
+      - SWIFT_VERSION=5.2.5
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      if: NOT (tag IS present)
+      - swift --version
+      - swift build
+      - swift test --filter BitByteDataTests
+      - swift build -c release # Check Release build just in case.
+    - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=5.1
+      - SWIFT_VERSION=5.3.3
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
-      - ./benchmarks.py run
-    - stage: benchmark
-      if: NOT (tag IS present)
+      - swift --version
+      - swift build
+      - swift test --filter BitByteDataTests
+      - swift build -c release # Check Release build just in case.
+    - stage: test
       language: generic
       os: linux
-      dist: xenial
+      dist: bionic
       env:
-      - SWIFT_VERSION=5.2
+      - SWIFT_VERSION=5.4
       install:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
-      - ./benchmarks.py run
+      - swift --version
+      - swift build
+      - swift test --filter BitByteDataTests
+      - swift build -c release # Check Release build just in case.
     - stage: deploy
-      if: tag IS present
+      # Don't deploy if it is a test release.
+      if: (tag IS present) AND (tag =~ /^\d+\.\d+\.\d+$/)
       language: generic
       os: osx
-      osx_image: xcode11.4
+      osx_image: xcode12
       env:
         secure: fmKQgrPRx2iisNPzxDhOTfXPsnQMJxDgIMItVNjl1AKByraOpiDAGVESySvy+vwQqITCB/BfvdkW7smAPcvFJxIPRx1v4J0VY9kGHdnafMw35XY0Vj9soYkzNS4zrUebxY2gWkGM6Q6dgLOGT/9MSEyWqXBTtVz9sLwA7yr3ZI72yZDbcSz3XGa1fFZRVfwv3I+bmuozG7dq7tyqcSKgRZnHg1VvaRdxcaGqSGSUsNu0YLzmNedujNcU+gTXcxMdrXA1eaheHc2pwNA0TDf3KkefJpaVMXrA/Un8e9MaJ1lMnPlIiEI3dPTuogtQY7p59vgulBNBPEJovTHI0jCaNyLUkTkHgGcUuOwHqwUIKZCEiiqM1j12sdLo4O2tAdNaNHDtd8D3bCakrdJxXlUWVfjrCwvBB555gd0drRirQgYX+5gGFwnTQE8tOcjK4qUvJaOAouHsnm/DmW+fLJPX76KoU6QOtGJt6PQ92yBgKRhaSg/sQ28WPuCmF2p7BuUSuULxcM2LU5eA5aFxayoZvR2E9uvfFxnFh01iV6clcZo25U03AuxJmuI7Mhl83amj8bm5CRBbuRw5sIljXfBujFUel+kz/HXalS7lStqH9iPyiQvh24WkPzHKNQdjRI7v3kyrVSXJ3Xl6+fopXqr/25MwqD4bt57QgglJ2IQtnLM=
       addons:
         homebrew:
           packages:
-          - carthage
           - sourcekitten
           update: true
       install:
       - gem install -N jazzy
       - gem update -N cocoapods
       before_deploy:
-      - >
-        if ! [ "$BEFORE_DEPLOY_RUN" ]; then
-          export BEFORE_DEPLOY_RUN=1;
-          # Build Carthage archive.
-          carthage build --no-skip-current
-          carthage archive BitByteData
-          # Generate documentation.
-          sourcekitten doc --spm-module BitByteData > docs.json
-          jazzy
-        fi
+      - sourcekitten doc --spm --module-name BitByteData > docs.json
+      - jazzy
       deploy:
-      - provider: releases
-        skip_cleanup: true
-        api_key: $GITHUB_TOKEN
-        file: "BitByteData.framework.zip"
-        on:
-          tags: true
       - provider: pages
-        skip_cleanup: true
         github_token: $GITHUB_TOKEN
         local_dir: docs
+        skip_cleanup: true
         on:
           tags: true
-          # Don't upload documentation if it is a test release.
-          condition: $(git describe) != *"test"*
diff --git a/BitByteData.podspec b/BitByteData.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BitByteData"
-  s.version      = "1.4.3"
+  s.version      = "1.4.4"
   s.summary      = "Read and write bits and bytes in Swift."
 
   s.description  = "A Swift framework with classes for reading and writing bits and bytes."

diff --git a/BitByteData.xcodeproj/BitByteData.plist b/BitByteData.xcodeproj/BitByteData.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.4.4</string>
 	<key>CFBundleVersion</key>
-	<string>22</string>
+	<string>23</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2020 Timofey Solomko. All rights reserved.</string>
 </dict>

diff --git a/BitByteData.xcodeproj/BitByteDataBenchmarks.plist b/BitByteData.xcodeproj/BitByteDataBenchmarks.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.4.4</string>
 	<key>CFBundleVersion</key>
-	<string>22</string>
+	<string>23</string>
 </dict>
 </plist>
diff --git a/BitByteData.xcodeproj/TestBitByteData.plist b/BitByteData.xcodeproj/TestBitByteData.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.4.4</string>
 	<key>CFBundleVersion</key>
-	<string>22</string>
+	<string>23</string>
 </dict>
 </plist>
diff --git a/BitByteData.xcodeproj/project.pbxproj b/BitByteData.xcodeproj/project.pbxproj
@@ -376,7 +376,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -424,7 +424,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 22;
+				CURRENT_PROJECT_VERSION = 23;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -454,7 +454,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 22;
+				DYLIB_CURRENT_VERSION = 23;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -478,7 +478,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 22;
+				DYLIB_CURRENT_VERSION = 23;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.4.4
+
+- Fixed a compilation warning about "deprecated class keyword" appearing when using Swift 5.4.
+
 ## 1.4.3
 
 - Fixed incompatibility with Swift Package Manager from Swift 4.2.

diff --git a/Sources/BitReader.swift b/Sources/BitReader.swift
@@ -6,7 +6,7 @@
 import Foundation
 
 /// A type that contains functions for reading `Data` bit-by-bit and byte-by-byte.
-public protocol BitReader: class {
+public protocol BitReader: AnyObject {
 
     /// True, if reader's BIT pointer is aligned with the BYTE border.
     var isAligned: Bool { get }