Skip to content

Commit

Permalink
Merge branch 'release/3.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
1024jp committed Nov 25, 2016
2 parents dc8b930 + ce7e922 commit 374a3da
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 3 deletions.
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.1
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Change Log
==========================

3.1.2
--------------------------

### New

- Support CocoaPods.

3.1.1
--------------------------

Expand Down
25 changes: 25 additions & 0 deletions GzipSwift.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Pod::Spec.new do |s|
s.name = "GzipSwift"
s.version = "3.1.2"
s.summary = "Swift framework that enables gzip/gunzip Data using zlib."

s.homepage = "https://github.com/1024jp/GzipSwift"
s.license = { :type => "MIT",
:file => "LICENSE" }
s.author = { "1024jp" => "[email protected]" }

s.source = { :git => "https://github.com/1024jp/GzipSwift.git",
:tag => s.version }
s.source_files = 'Sources/*.swift'

s.module_name = 'Gzip'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '8.0'
s.watchos.deployment_target = '2.0'
s.tvos.deployment_target = '9.0'

s.requires_arc = true
s.library = 'z'
s.preserve_path = 'zlib/*'
s.pod_target_xcconfig = { 'SWIFT_INCLUDE_PATHS' => '$(PODS_ROOT)/GzipSwift/zlib' }
end
2 changes: 1 addition & 1 deletion Project/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>3.1.1</string>
<string>3.1.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GzipSwift
[![Swift](https://img.shields.io/badge/Swift-3.0.1-blue.svg)]()
[![platform](https://img.shields.io/badge/platform-macOS | iOS | watchOS | tvOS | Linux-blue.svg)]()
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CocoaPods compatible](http://img.shields.io/cocoapods/v/GzipSwift.svg?style=flat)](http://cocoadocs.org/docsets/GzipSwift)
[![Build Status](https://img.shields.io/travis/1024jp/GzipSwift/master.svg?style=flat)](https://travis-ci.org/1024jp/GzipSwift)
[![codecov.io](https://codecov.io/gh/1024jp/GzipSwift/branch/master/graphs/badge.svg)](https://codecov.io/gh/1024jp/GzipSwift)
[![License](https://img.shields.io/github/license/1024jp/GzipSwift.svg)](https://github.com/1024jp/GzipSwift/blob/develop/LICENSE)
Expand Down Expand Up @@ -51,6 +52,15 @@ GzipSwift is Carthage compatible. You can easily build GzipSwift adding the foll
```ruby
github "1024jp/GzipSwift"
```

### Build via CocoaPods
GzipSwift is available through [CocoaPods](http://cocoapods.org). To install
it, simply add the following line to your Podfile:

```ruby
pod "GzipSwift"
```

### For Linux platform with swift package manager

1. First you need to install zlib if you haven't installed yet:
Expand Down
4 changes: 2 additions & 2 deletions Sources/Data+Gzip.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Data+Gzip.swift
//
// Version 3.1.1
// Version 3.1.2

/*
The MIT License (MIT)
Expand Down Expand Up @@ -160,7 +160,7 @@ public enum GzipError: Error {
public extension Data {

/**
Check if the reciever is already gzipped.
Check if the receiver is already gzipped.

- returns: Whether the data is compressed.
*/
Expand Down

0 comments on commit 374a3da

Please sign in to comment.