Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tsolomko committed Apr 20, 2024
2 parents 36df26f + bab8aa3 commit cdcdc51
Show file tree
Hide file tree
Showing 40 changed files with 135 additions and 68 deletions.
6 changes: 3 additions & 3 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ sourcekitten_sourcefile: docs.json
clean: false
author: Timofey Solomko
module: BitByteData
module_version: 2.0.3
copyright: '© 2023 Timofey Solomko'
module_version: 2.0.4
copyright: '© 2024 Timofey Solomko'
readme: README.md
github_url: https://github.com/tsolomko/BitByteData
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/2.0.3
github_file_prefix: https://github.com/tsolomko/BitByteData/tree/2.0.4
theme: fullwidth

custom_categories:
Expand Down
4 changes: 3 additions & 1 deletion BitByteData.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "BitByteData"
s.version = "2.0.3"
s.version = "2.0.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."
Expand All @@ -19,9 +19,11 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.13"
s.tvos.deployment_target = "11.0"
s.watchos.deployment_target = "4.0"
s.visionos.deployment_target = "1.0"

s.swift_versions = ["5"]

s.source_files = "Sources/*.swift"
s.resource_bundles = {"BitByteData" => ["Sources/PrivacyInfo.xcprivacy"]}

end
6 changes: 3 additions & 3 deletions BitByteData.xcodeproj/BitByteData.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.3</string>
<string>2.0.4</string>
<key>CFBundleVersion</key>
<string>29</string>
<string>30</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2023 Timofey Solomko</string>
<string>Copyright © 2024 Timofey Solomko</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions BitByteData.xcodeproj/BitByteDataBenchmarks.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.0.3</string>
<string>2.0.4</string>
<key>CFBundleVersion</key>
<string>29</string>
<string>30</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions BitByteData.xcodeproj/TestBitByteData.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.0.3</string>
<string>2.0.4</string>
<key>CFBundleVersion</key>
<string>29</string>
<string>30</string>
</dict>
</plist>
39 changes: 30 additions & 9 deletions BitByteData.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
06FA0DC421935115009B4DEB /* LsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B0E2177947600B6B7BB /* LsbBitWriterBenchmarks.swift */; };
06FA0DC521935115009B4DEB /* MsbBitWriterBenchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A81B102177955500B6B7BB /* MsbBitWriterBenchmarks.swift */; };
E608AB16253740C60036626D /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E608AB15253740C60036626D /* TestHelper.swift */; };
E62333132BD3ED6B005469A8 /* PrivacyInfo.xcprivacy in CopyFiles */ = {isa = PBXBuildFile; fileRef = E62333112BD3ECC2005469A8 /* PrivacyInfo.xcprivacy */; };
E6425642267FA97E002D75D8 /* SignedNumberRepresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6425641267FA97E002D75D8 /* SignedNumberRepresentationTests.swift */; };
/* End PBXBuildFile section */

Expand All @@ -55,11 +56,23 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
E62333122BD3ED52005469A8 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 7;
files = (
E62333132BD3ED6B005469A8 /* PrivacyInfo.xcprivacy in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0602483B225A0416006143B1 /* ByteReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ByteReader.swift; sourceTree = "<group>"; };
060F68312176024400688683 /* LsbBitReaderBenchmarks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LsbBitReaderBenchmarks.swift; sourceTree = "<group>"; };
060F6833217604E800688683 /* MsbBitReaderBenchmarks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsbBitReaderBenchmarks.swift; sourceTree = "<group>"; };
062BE3301FFBB9E300343CAD /* LinuxMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinuxMain.swift; sourceTree = "<group>"; };
064344992259F88C00D8EB57 /* BigEndianByteReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigEndianByteReader.swift; sourceTree = "<group>"; };
0643449B2259FB2200D8EB57 /* BigEndianByteReaderBenchmarks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigEndianByteReaderBenchmarks.swift; sourceTree = "<group>"; };
0643449D2259FB2F00D8EB57 /* BigEndianByteReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigEndianByteReaderTests.swift; sourceTree = "<group>"; };
Expand All @@ -86,6 +99,7 @@
06F0656C1FFAEA4B00312A82 /* BitByteData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BitByteData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
06F065811FFAEAA000312A82 /* TestBitByteData.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestBitByteData.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E608AB15253740C60036626D /* TestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelper.swift; sourceTree = "<group>"; };
E62333112BD3ECC2005469A8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
E6425641267FA97E002D75D8 /* SignedNumberRepresentationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignedNumberRepresentationTests.swift; sourceTree = "<group>"; };
E6C168EA28DF190200E7345D /* BitByteData.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = BitByteData.xctestplan; path = BitByteData.xcodeproj/BitByteData.xctestplan; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -149,6 +163,7 @@
06F0655D1FFAEA1F00312A82 /* BitWriter.swift */,
06F0655E1FFAEA1F00312A82 /* LsbBitWriter.swift */,
06F0655C1FFAEA1F00312A82 /* MsbBitWriter.swift */,
E62333112BD3ECC2005469A8 /* PrivacyInfo.xcprivacy */,
);
path = Sources;
sourceTree = "<group>";
Expand All @@ -158,7 +173,6 @@
children = (
065DD5E021673BC100704028 /* BitByteDataBenchmarks */,
06F065611FFAEA1F00312A82 /* BitByteDataTests */,
062BE3301FFBB9E300343CAD /* LinuxMain.swift */,
);
path = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -213,6 +227,7 @@
buildConfigurationList = 06F065721FFAEA4C00312A82 /* Build configuration list for PBXNativeTarget "BitByteData" */;
buildPhases = (
06F065671FFAEA4B00312A82 /* Sources */,
E62333122BD3ED52005469A8 /* CopyFiles */,
);
buildRules = (
);
Expand Down Expand Up @@ -249,7 +264,7 @@
BuildIndependentTargetsInParallel = YES;
DefaultBuildSystemTypeForWorkspace = Latest;
LastSwiftUpdateCheck = 1000;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1530;
ORGANIZATIONNAME = "Timofey Solomko";
TargetAttributes = {
065DD5DE21673BC100704028 = {
Expand Down Expand Up @@ -390,6 +405,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -409,12 +425,13 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
EAGER_LINKING = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -428,19 +445,21 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CODE_SIGN_FLAGS = "--deep";
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos xrsimulator xros";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
VERSIONING_SYSTEM = "apple-generic";
WATCHOS_DEPLOYMENT_TARGET = 4.0;
XROS_DEPLOYMENT_TARGET = 1.0;
};
name = Debug;
};
06F065551FFAE9EC00312A82 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -460,11 +479,12 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CURRENT_PROJECT_VERSION = 29;
CURRENT_PROJECT_VERSION = 30;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EAGER_LINKING = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
Expand All @@ -476,12 +496,13 @@
MACOSX_DEPLOYMENT_TARGET = 10.13;
OTHER_CODE_SIGN_FLAGS = "--deep";
SDKROOT = macosx;
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos xrsimulator xros";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
VERSIONING_SYSTEM = "apple-generic";
WATCHOS_DEPLOYMENT_TARGET = 4.0;
XROS_DEPLOYMENT_TARGET = 1.0;
};
name = Release;
};
Expand All @@ -491,7 +512,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 29;
DYLIB_CURRENT_VERSION = 30;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
Expand All @@ -518,7 +539,7 @@
APPLICATION_EXTENSION_API_ONLY = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 29;
DYLIB_CURRENT_VERSION = 30;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
INFOPLIST_FILE = BitByteData.xcodeproj/BitByteData.plist;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# Changelog

## 2.0.4

- Swift 5.2 is no longer supported.
- Enable visionOS deployment target (except for SPM).
- Add PrivacyInfo file.

## 2.0.3

- There are now minimum deployment targets specified in Swift Package Manager manifest.

## 2.0.2

- Swift 5.0 and 5.1 is no longer supported.
- Swift 5.0 and 5.1 are no longer supported.
- Increased minimum deployment versions (when installed via CocoaPods or Carthage) for Darwin platforms: macOS from 10.10
to 10.13, iOS from 9.0 to 11.0, tvOS from 9.0 to 11.0, and watchOS from 2.0 to 4.0.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Timofey Solomko
Copyright (c) 2024 Timofey Solomko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 5 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.2
// swift-tools-version:5.3
import PackageDescription

let package = Package(
Expand All @@ -7,15 +7,17 @@ let package = Package(
.macOS(.v10_13),
.iOS(.v11),
.tvOS(.v11),
.watchOS(.v4)
.watchOS(.v4),
// TODO: Enable after upgrading to Swift 5.9.
// .visionOS(.v1)
],
products: [
.library(
name: "BitByteData",
targets: ["BitByteData"])
],
targets: [
.target(name: "BitByteData", path: "Sources"),
.target(name: "BitByteData", path: "Sources", resources: [.copy("PrivacyInfo.xcprivacy")]),
.testTarget(name: "BitByteDataTests", dependencies: ["BitByteData"]),
.testTarget(name: "BitByteDataBenchmarks", dependencies: ["BitByteData"])
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BitByteData

[![Swift 5.2+](https://img.shields.io/badge/Swift-5.2+-blue.svg)](https://developer.apple.com/swift/)
[![Swift 5.3+](https://img.shields.io/badge/Swift-5.3+-blue.svg)](https://developer.apple.com/swift/)
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/BitByteData/master/LICENSE)
[![Build Status](https://dev.azure.com/tsolomko/BitByteData/_apis/build/status/tsolomko.BitByteData?branchName=develop)](https://dev.azure.com/tsolomko/BitByteData/_build/latest?definitionId=2&branchName=develop)

Expand Down
2 changes: 1 addition & 1 deletion Sources/BigEndianByteReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/BitWriter.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/ByteReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/Extensions.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/LittleEndianByteReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/LsbBitReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/LsbBitWriter.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/MsbBitReader.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
2 changes: 1 addition & 1 deletion Sources/MsbBitWriter.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
14 changes: 14 additions & 0 deletions Sources/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Sources/SignedNumberRepresentation.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023 Timofey Solomko
// Copyright (c) 2024 Timofey Solomko
// Licensed under MIT License
//
// See LICENSE for license information
Expand Down
Loading

0 comments on commit cdcdc51

Please sign in to comment.