Skip to content

Commit 730672e

Browse files
tsolomkotsolomko
committed
Merge branch 'develop'
2 parents ff8113e + 2efdb3e commit 730672e

39 files changed

Lines changed: 547 additions & 402 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: false
44
author: Timofey Solomko
55
module: SWCompression
6-
module_version: 4.6.0
6+
module_version: 4.6.1
77
copyright: '© 2021 Timofey Solomko'
88
readme: README.md
99
github_url: https://github.com/tsolomko/SWCompression
10-
github_file_prefix: https://github.com/tsolomko/SWCompression/tree/4.6.0
10+
github_file_prefix: https://github.com/tsolomko/SWCompression/tree/4.6.1
1111
theme: fullwidth
1212

1313
custom_categories:

‎.travis.yml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎CHANGELOG.md‎

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

3+
## 4.6.1
4+
5+
- Fixed a crash in LZMA2 when trying to process an empty `Data`.
6+
- swcomp changes:
7+
- Added `benchmark create-tar` benchmarking command.
8+
- Benchmarking results are now printed in the units of speed instead of time elapsed.
9+
310
## 4.6.0
411

512
- Swift 4.2 is no longer supported.

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![Swift 5.X](https://img.shields.io/badge/Swift-5.X-blue.svg)](https://developer.apple.com/swift/)
44
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/SWCompression/master/LICENSE)
5-
[![Build Status](https://travis-ci.com/tsolomko/SWCompression.svg?branch=develop)](https://travis-ci.com/tsolomko/SWCompression)
65
[![Build Status](https://dev.azure.com/tsolomko/SWCompression/_apis/build/status/tsolomko.SWCompression?branchName=develop)](https://dev.azure.com/tsolomko/SWCompression/_build/latest?definitionId=3&branchName=develop)
76

87
A framework with (de)compression algorithms and functions for working with various archives and containers.

‎SWCompression.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 = "SWCompression"
4-
s.version = "4.6.0"
4+
s.version = "4.6.1"
55
s.summary = "A framework with functions for working with compression, archives and containers."
66

77
s.description = "A framework with (de)compression algorithms and functions for processing various archives and containers."

‎SWCompression.xcodeproj/SWCompression.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>4.6.0</string>
18+
<string>4.6.1</string>
1919
<key>CFBundleVersion</key>
20-
<string>80</string>
20+
<string>81</string>
2121
<key>NSHumanReadableCopyright</key>
2222
<string>Copyright © 2021 Timofey Solomko</string>
2323
</dict>

‎SWCompression.xcodeproj/TestSWCompression.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>4.6.0</string>
18+
<string>4.6.1</string>
1919
<key>CFBundleVersion</key>
20-
<string>80</string>
20+
<string>81</string>
2121
</dict>
2222
</plist>

‎SWCompression.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@
220220
E652D8F5263D678000FC229B /* test_nonstandard_runlength.answer in Resources */ = {isa = PBXBuildFile; fileRef = E652D8F4263D678000FC229B /* test_nonstandard_runlength.answer */; };
221221
E66F36242538726E00076A6E /* test_empty.lzma in Resources */ = {isa = PBXBuildFile; fileRef = E66F36232538726E00076A6E /* test_empty.lzma */; };
222222
E66F362C2538E2B700076A6E /* test_empty.zlib in Resources */ = {isa = PBXBuildFile; fileRef = E66F362B2538E2B700076A6E /* test_empty.zlib */; };
223+
E6EDD6A826F7767F00884532 /* test_minor_version_3.7z in Resources */ = {isa = PBXBuildFile; fileRef = E6EDD6A626F7767E00884532 /* test_minor_version_3.7z */; };
224+
E6EDD6A926F7767F00884532 /* test_minor_version_4.7z in Resources */ = {isa = PBXBuildFile; fileRef = E6EDD6A726F7767E00884532 /* test_minor_version_4.7z */; };
225+
E6EDD6AC26F77C0E00884532 /* test_minor_version_2.7z in Resources */ = {isa = PBXBuildFile; fileRef = E6EDD6AB26F77C0E00884532 /* test_minor_version_2.7z */; };
223226
/* End PBXBuildFile section */
224227

225228
/* Begin PBXContainerItemProxy section */
@@ -447,6 +450,9 @@
447450
E652D8F4263D678000FC229B /* test_nonstandard_runlength.answer */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_nonstandard_runlength.answer; sourceTree = "<group>"; };
448451
E66F36232538726E00076A6E /* test_empty.lzma */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_empty.lzma; sourceTree = "<group>"; };
449452
E66F362B2538E2B700076A6E /* test_empty.zlib */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_empty.zlib; sourceTree = "<group>"; };
453+
E6EDD6A626F7767E00884532 /* test_minor_version_3.7z */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_minor_version_3.7z; sourceTree = "<group>"; };
454+
E6EDD6A726F7767E00884532 /* test_minor_version_4.7z */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_minor_version_4.7z; sourceTree = "<group>"; };
455+
E6EDD6AB26F77C0E00884532 /* test_minor_version_2.7z */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_minor_version_2.7z; sourceTree = "<group>"; };
450456
/* End PBXFileReference section */
451457

452458
/* Begin PBXFrameworksBuildPhase section */
@@ -883,6 +889,9 @@
883889
06F066061FFB763300312A82 /* test_win.7z */,
884890
0627A4D220FE521B0023987C /* test_unicode.7z */,
885891
068D070321368617002A6C3B /* test_delta_filter.7z */,
892+
E6EDD6AB26F77C0E00884532 /* test_minor_version_2.7z */,
893+
E6EDD6A626F7767E00884532 /* test_minor_version_3.7z */,
894+
E6EDD6A726F7767E00884532 /* test_minor_version_4.7z */,
886895
06F066071FFB763300312A82 /* SWCompressionSourceCode.7z */,
887896
);
888897
path = 7z;
@@ -949,7 +958,7 @@
949958
isa = PBXProject;
950959
attributes = {
951960
LastSwiftUpdateCheck = 0920;
952-
LastUpgradeCheck = 1250;
961+
LastUpgradeCheck = 1300;
953962
ORGANIZATIONNAME = "Timofey Solomko";
954963
TargetAttributes = {
955964
06BE1AC71DB410F100EE0F59 = {
@@ -991,6 +1000,7 @@
9911000
06F066201FFB763300312A82 /* test1.answer in Resources */,
9921001
06F0664E1FFB763400312A82 /* test_v7.tar in Resources */,
9931002
06F0662E1FFB763400312A82 /* test2.gz in Resources */,
1003+
E6EDD6AC26F77C0E00884532 /* test_minor_version_2.7z in Resources */,
9941004
06F0665C1FFB763400312A82 /* test9.lzma in Resources */,
9951005
06F066661FFB763400312A82 /* test3.7z in Resources */,
9961006
06F0664B1FFB763400312A82 /* test.tar in Resources */,
@@ -1073,6 +1083,7 @@
10731083
06F066351FFB763400312A82 /* test5.xz in Resources */,
10741084
06F066631FFB763400312A82 /* test_complicated_coding_scheme.7z in Resources */,
10751085
06F066641FFB763400312A82 /* test_anti_file.7z in Resources */,
1086+
E6EDD6A826F7767F00884532 /* test_minor_version_3.7z in Resources */,
10761087
064D01AD20FD077D00CAE058 /* test_unicode_pax.tar in Resources */,
10771088
06F0665E1FFB763400312A82 /* test_empty_cont.7z in Resources */,
10781089
06F066731FFB763400312A82 /* test3.bz2 in Resources */,
@@ -1083,6 +1094,7 @@
10831094
06F066571FFB763400312A82 /* test_empty_file.tar in Resources */,
10841095
06F066441FFB763400312A82 /* test_data_descriptor.zip in Resources */,
10851096
06F066581FFB763400312A82 /* full_test.tar in Resources */,
1097+
E6EDD6A926F7767F00884532 /* test_minor_version_4.7z in Resources */,
10861098
06F0662B1FFB763400312A82 /* test3.gz in Resources */,
10871099
06F0664C1FFB763400312A82 /* test_pax.tar in Resources */,
10881100
06F0663A1FFB763400312A82 /* test_multi.xz in Resources */,
@@ -1270,7 +1282,7 @@
12701282
CLANG_WARN_SUSPICIOUS_MOVE = YES;
12711283
CLANG_WARN_UNREACHABLE_CODE = YES;
12721284
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1273-
CURRENT_PROJECT_VERSION = 80;
1285+
CURRENT_PROJECT_VERSION = 81;
12741286
DEBUG_INFORMATION_FORMAT = dwarf;
12751287
ENABLE_STRICT_OBJC_MSGSEND = YES;
12761288
ENABLE_TESTABILITY = YES;
@@ -1351,7 +1363,7 @@
13511363
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13521364
CLANG_WARN_UNREACHABLE_CODE = YES;
13531365
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1354-
CURRENT_PROJECT_VERSION = 80;
1366+
CURRENT_PROJECT_VERSION = 81;
13551367
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13561368
ENABLE_STRICT_OBJC_MSGSEND = YES;
13571369
"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
@@ -1412,7 +1424,7 @@
14121424
APPLICATION_EXTENSION_API_ONLY = YES;
14131425
DEFINES_MODULE = YES;
14141426
DYLIB_COMPATIBILITY_VERSION = 1;
1415-
DYLIB_CURRENT_VERSION = 80;
1427+
DYLIB_CURRENT_VERSION = 81;
14161428
DYLIB_INSTALL_NAME_BASE = "@rpath";
14171429
INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist;
14181430
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1439,7 +1451,7 @@
14391451
APPLICATION_EXTENSION_API_ONLY = YES;
14401452
DEFINES_MODULE = YES;
14411453
DYLIB_COMPATIBILITY_VERSION = 1;
1442-
DYLIB_CURRENT_VERSION = 80;
1454+
DYLIB_CURRENT_VERSION = 81;
14431455
DYLIB_INSTALL_NAME_BASE = "@rpath";
14441456
INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist;
14451457
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

‎SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sources/7-Zip/7zProperty.swift‎

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

9-
class SevenZipProperty {
9+
struct SevenZipProperty {
1010

1111
let type: UInt8
1212
let size: Int

0 commit comments

Comments
 (0)