Skip to content

Commit

Permalink
Merge pull request #37 from ranesr/release/2.2.0
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
ranesr authored Jul 28, 2018
2 parents 6041304 + 93caba3 commit e159f10
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

## [2.2.0] - 2018-07-19

### Added

- Carthage Support [#6]

## [2.1.0] - 2018-07-08

### Added
Expand Down Expand Up @@ -84,7 +90,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Initial Version of SwiftIcons
- Support for Cocoapods

[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/2.1.0...master
[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/2.2.0...master
[2.2.0]: https://github.com/ranesr/SwiftIcons/compare/2.1.0...2.2.0
[2.1.0]: https://github.com/ranesr/SwiftIcons/compare/2.0.1...2.1.0
[2.0.1]: https://github.com/ranesr/SwiftIcons/compare/2.0...2.0.1
[2.0]: https://github.com/ranesr/SwiftIcons/compare/1.5.1...2.0
Expand All @@ -99,6 +106,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
[Tests]: https://github.com/ranesr/SwiftIcons/tree/master/SwiftIconsTests
[Extensions.swift]: https://github.com/ranesr/SwiftIcons/blob/master/SwiftIcons/Extensions.swift
[Hue]: https://github.com/hyperoslo/Hue
[#6]: https://github.com/ranesr/SwiftIcons/issues/6
[#7]: https://github.com/ranesr/SwiftIcons/issues/7
[#14]: https://github.com/ranesr/SwiftIcons/issues/14
[#23]: https://github.com/ranesr/SwiftIcons/issues/23
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[![SwiftIcons](https://github.com/ranesr/SwiftIcons/raw/master/resources/logo.png)]()

[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](https://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%204.1-orange.svg)
[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](https://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%204.1-orange.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

[![Travis](https://img.shields.io/travis/ranesr/SwiftIcons.svg)](https://travis-ci.org/ranesr/SwiftIcons/)
[![Travis](https://img.shields.io/travis/ranesr/SwiftIcons.svg)](https://travis-ci.org/ranesr/SwiftIcons/) [![License](https://img.shields.io/cocoapods/l/SwiftIcons.svg?style=flat)](http://cocoapods.org/pods/SwiftIcons)

## Swift Library for Font Icons

Expand Down Expand Up @@ -68,7 +68,7 @@ Add the following lines to your `Podfile`:
```ruby
target 'YourProject' do
use_frameworks!
pod 'SwiftIcons', '~> 2.1.0'
pod 'SwiftIcons', '~> 2.2.0'
end
```

Expand All @@ -93,7 +93,7 @@ Install the latest version of [Carthage](https://github.com/Carthage/Carthage#in
Add this line to your `Cartfile`:

```
github "ranesr/SwiftIcons" ~> 2.1
github "ranesr/SwiftIcons" ~> 2.2.0
```

or for `master`,
Expand Down
2 changes: 1 addition & 1 deletion SwiftIcons.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SwiftIcons'
s.version = '2.1.0'
s.version = '2.2.0'
s.summary = 'SwiftIcons - A library for using different font icons'
s.description = 'SwiftIcons library helps you use icons from any of these font icons - Dripicons, Emoji, FontAwesome, Icofont, Ionicons, Linearicons, Map-icons, Material icons, Open iconic, State face icons, Weather icons'

Expand Down
2 changes: 1 addition & 1 deletion SwiftIconsApp/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<action selector="goToGithub:" destination="992-F2-xEZ" eventType="touchUpInside" id="I3n-uX-RS9"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version: 2.1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4a-eR-qB1">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version: 2.2.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4a-eR-qB1">
<rect key="frame" x="30" y="377" width="315" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="szw-oy-t1T"/>
Expand Down
2 changes: 1 addition & 1 deletion SwiftIconsApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.1.0</string>
<string>2.2.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
Binary file modified docs/images/pic01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e159f10

Please sign in to comment.