Skip to content

Commit

Permalink
Merge branch 'hotfix-2.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
tsolomko committed May 6, 2017
2 parents 5fa8e7c + d883c37 commit 4ee4856
Show file tree
Hide file tree
Showing 73 changed files with 366 additions and 461 deletions.
5 changes: 2 additions & 3 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
output: docs/
clean: true
exclude: Tests/
swift_version: 3.1
author: Timofey Solomko
module: SWCompression
module_version: 2.4.0
module_version: 2.4.1
copyright: '© 2017 Timofey Solomko'
readme: README.md
github_url: https://github.com/tsolomko/SWCompression
github_file_prefix: https://github.com/tsolomko/SWCompression/tree/v2.4.0
github_file_prefix: https://github.com/tsolomko/SWCompression/tree/v2.4.1
theme: fullwidth
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog
v2.4.1
----------------
- Lowered deployment targets versions for all (supported) Apple platforms.

v2.4.0
----------------
- Reduced memory usage in some cases.
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# SWCompression
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/SWCompression/master/LICENSE) [![CocoaPods](https://img.shields.io/cocoapods/p/SWCompression.svg)](https://cocoapods.org/pods/SWCompression) [![Swift 3](https://img.shields.io/badge/Swift-3.0.2-lightgrey.svg)](https://developer.apple.com/swift/)
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/SWCompression/master/LICENSE)
[![CocoaPods](https://img.shields.io/cocoapods/p/SWCompression.svg)](https://cocoapods.org/pods/SWCompression)
[![Swift 3](https://img.shields.io/badge/Swift-3.1.1-lightgrey.svg)](https://developer.apple.com/swift/)
[![Build Status](https://travis-ci.org/tsolomko/SWCompression.svg?branch=develop)](https://travis-ci.org/tsolomko/SWCompression) [![codecov](https://codecov.io/gh/tsolomko/SWCompression/branch/develop/graph/badge.svg)](https://codecov.io/gh/tsolomko/SWCompression)

[![CocoaPods](https://img.shields.io/cocoapods/v/SWCompression.svg)](https://cocoapods.org/pods/SWCompression)
Expand Down
10 changes: 5 additions & 5 deletions SWCompression.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "SWCompression"
s.version = "2.4.0"
s.version = "2.4.1"
s.summary = "Framework with implementations in Swift of different (de)compression algorithms"

s.description = <<-DESC
Expand All @@ -18,10 +18,10 @@ Pod::Spec.new do |s|

s.author = { "Timofey Solomko" => "[email protected]" }

s.ios.deployment_target = "10.1"
s.osx.deployment_target = "10.12"
s.tvos.deployment_target = "10.0"
s.watchos.deployment_target = "3.1"
s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.10"
s.tvos.deployment_target = "9.0"
s.watchos.deployment_target = "2.0"

s.source = { :git => "https://github.com/tsolomko/SWCompression.git", :tag => "v#{s.version}" }

Expand Down
14 changes: 8 additions & 6 deletions SWCompression.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Service/Info-iOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
PRODUCT_NAME = SWCompression;
Expand All @@ -926,7 +926,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Service/Info-iOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
PRODUCT_NAME = SWCompression;
Expand Down Expand Up @@ -957,7 +957,7 @@
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.1;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Debug;
};
Expand All @@ -981,7 +981,7 @@
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 3.1;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Release;
};
Expand All @@ -1004,7 +1004,7 @@
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 10.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
};
Expand All @@ -1027,7 +1027,7 @@
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 10.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -1146,6 +1146,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Sources/Service/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -1170,6 +1171,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Sources/Service/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Service/Info-iOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Service/Info-tvOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Service/Info-watchOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Service/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.4.0</string>
<string>2.4.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
18 changes: 9 additions & 9 deletions docs/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/LZMA2.swift#L38-L106">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/LZMA2.swift#L38-L106">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -221,7 +221,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/GzipArchive.swift#L182-L268">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/GzipArchive.swift#L182-L268">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -256,7 +256,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/ZipContainer.swift#L77-L236">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/ZipContainer.swift#L77-L236">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -291,7 +291,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/LZMA.swift#L44-L90">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/LZMA.swift#L44-L90">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -326,7 +326,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/ZlibArchive.swift#L125-L189">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/ZlibArchive.swift#L125-L189">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -361,7 +361,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/Deflate.swift#L32-L518">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/Deflate.swift#L32-L518">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -396,7 +396,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/BZip2.swift#L47-L277">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/BZip2.swift#L47-L277">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -431,7 +431,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/XZArchive.swift#L58-L346">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/XZArchive.swift#L58-L346">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -445,7 +445,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>© 2017 Timofey Solomko</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.7.5</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
</div>
Expand Down
7 changes: 2 additions & 5 deletions docs/Classes/BZip2.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ <h1>BZip2</h1>
<p>Decompresses <code>compressedData</code> with BZip2 algortihm.</p>

<p>If data passed is not actually compressed with BZip2, <code><a href="../Enums/BZip2Error.html">BZip2Error</a></code> will be thrown.</p>

<div class="aside aside-throws">
<p class="aside-title">Throws</p>
<p><code><a href="../Enums/BZip2Error.html">BZip2Error</a></code> if unexpected byte (bit) sequence was encountered in <code>compressedData</code>.
Expand Down Expand Up @@ -213,7 +212,6 @@ <h4>Parameters</h4>
<td>
<div>
<p>Data compressed with BZip2.</p>

</div>
</td>
</tr>
Expand All @@ -223,10 +221,9 @@ <h4>Parameters</h4>
<div>
<h4>Return Value</h4>
<p>Decompressed data.</p>

</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/BZip2.swift#L61-L97">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/BZip2.swift#L61-L97">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -240,7 +237,7 @@ <h4>Return Value</h4>
</div>
<section class="footer">
<p>© 2017 Timofey Solomko</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.7.5</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
</div>
Expand Down
10 changes: 3 additions & 7 deletions docs/Classes/Deflate.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ <h1>Deflate</h1>
<p>Decompresses <code>compressedData</code> with DEFLATE algortihm.</p>

<p>If data passed is not actually compressed with DEFLATE, <code><a href="../Enums/DeflateError.html">DeflateError</a></code> will be thrown.</p>

<div class="aside aside-throws">
<p class="aside-title">Throws</p>
<p><code><a href="../Enums/DeflateError.html">DeflateError</a></code> if unexpected byte (bit) sequence was encountered in <code>compressedData</code>.
Expand Down Expand Up @@ -213,7 +212,6 @@ <h4>Parameters</h4>
<td>
<div>
<p>Data compressed with DEFLATE.</p>

</div>
</td>
</tr>
Expand All @@ -223,10 +221,9 @@ <h4>Parameters</h4>
<div>
<h4>Return Value</h4>
<p>Decompressed data.</p>

</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/Deflate.swift#L79-L83">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/Deflate.swift#L79-L83">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -247,7 +244,6 @@ <h4>Return Value</h4>
<p>Compresses <code>data</code> with DEFLATE algortihm.</p>

<p>If during compression something goes wrong <code><a href="../Enums/DeflateError.html">DeflateError</a></code> will be thrown.</p>

<div class="aside aside-note">
<p class="aside-title">Note</p>
Currently, SWCompression creates only one block for all data
Expand All @@ -267,7 +263,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.0/Sources/Deflate.swift#L271-L327">Show on GitHub</a>
<a href="https://github.com/tsolomko/SWCompression/tree/v2.4.1/Sources/Deflate.swift#L271-L327">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -281,7 +277,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>© 2017 Timofey Solomko</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.7.5</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.8.1</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</body>
</div>
Expand Down
Loading

0 comments on commit 4ee4856

Please sign in to comment.