Skip to content

Commit

Permalink
Merge pull request #2 from EurekaCommunity/1.2.0
Browse files Browse the repository at this point in the history
Podspec updated to Eureka 3.0.
  • Loading branch information
mats-claassen authored Apr 26, 2017
2 parents c7e233e + 0b68c01 commit 6aefd45
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to TokenRow will be documented in this file.

### [1.2.0](https://github.com/EurekaCommunity/TokenRow/releases/tag/1.2.0)
<!-- Released on 2017-04-26. -->

* Added Eureka 3.0.0 support

### [1.1.0](https://github.com/EurekaCommunity/TokenRow/releases/tag/1.0.0)
<!-- Released on 2016-10-07. -->

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ To see what you can customize have a look at the [Customization](#customization)

## Dependencies
* [Eureka] 2.x
* [CLTokenInputView] which is a token view pod
* [CLTokenInputView] which is a token view pod

## Requirements

* iOS 8.0+
* Xcode 8+
* Xcode 8.3+

## Getting involved

Expand Down Expand Up @@ -116,7 +116,7 @@ final class User {
var id: Int = 0
var name: String = ""
var avatar: String?

// conform to Hashable
var hashValue: Int {
return id
Expand Down Expand Up @@ -149,7 +149,7 @@ Many things of this row are very similar to the [SuggestionRow] and the [GoogleP

### General customization

There are several parts of the TokenRow that you can change. First of all, if you want to change the view that contains the tokens then you should have a look at [CLTokenInputView].
There are several parts of the TokenRow that you can change. First of all, if you want to change the view that contains the tokens then you should have a look at [CLTokenInputView].

A thing you must do for each of these rows is provide the options from which the user can choose a token. The conventional way is to specify an array of options to the `options` variable of the row:

Expand Down Expand Up @@ -231,4 +231,4 @@ This can be found in the [CHANGELOG.md](CHANGELOG.md) file.
[CLTokenInputView]: https://github.com/clusterinc/CLTokenInputView
[Eureka]: https://github.com/xmartlabs/eureka
[SuggestionRow]: https://github.com/EurekaCommunity/SuggestionRow
[GooglePlacesRow]: https://github.com/EurekaCommunity/GooglePlacesRow
[GooglePlacesRow]: https://github.com/EurekaCommunity/GooglePlacesRow
4 changes: 2 additions & 2 deletions TokenRow.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "TokenRow"
s.version = "1.1.0"
s.version = "1.2.0"
s.summary = "An Eureka row that allows the user to select options into a token view."
s.homepage = "https://github.com/EurekaCommunity/TokenRow"
s.license = { type: 'MIT', file: 'LICENSE' }
Expand All @@ -11,6 +11,6 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.ios.source_files = 'TokenRow/Sources/**/*.{swift}'
s.ios.frameworks = 'UIKit', 'Foundation'
s.dependency 'Eureka', '~> 2.0.0-beta.1'
s.dependency 'Eureka', '~> 3.0'
s.dependency 'CLTokenInputView', '~> 2.0'
end
5 changes: 3 additions & 2 deletions TokenRow/Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '9.0'

use_frameworks!

def pods
pod 'Alamofire', '~> 4.0'
pod 'AlamofireImage'
pod 'CLTokenInputView', '~> 2.0'
pod 'AlamofireImage'
pod 'CLTokenInputView', '~> 2.3'
pod 'TokenRow', :path => '../../'
end

Expand Down
26 changes: 13 additions & 13 deletions TokenRow/Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
PODS:
- Alamofire (4.0.1)
- AlamofireImage (3.1.0):
- Alamofire (~> 4.0)
- Alamofire (4.4.0)
- AlamofireImage (3.2.0):
- Alamofire (~> 4.1)
- CLTokenInputView (2.3.0)
- Eureka (2.0.0-beta.1)
- TokenRow (1.0.0):
- Eureka (3.0.0)
- TokenRow (1.2.0):
- CLTokenInputView (~> 2.0)
- Eureka (~> 2.0.0-beta.1)
- Eureka (~> 3.0)

DEPENDENCIES:
- Alamofire (~> 4.0)
- AlamofireImage
- CLTokenInputView (~> 2.0)
- CLTokenInputView (~> 2.3)
- TokenRow (from `../../`)

EXTERNAL SOURCES:
TokenRow:
:path: ../../

SPEC CHECKSUMS:
Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
AlamofireImage: bb8c8351c51cb1633bb6be69b6dbbaff37ce65b7
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
AlamofireImage: 157ed682cc81d3b9db4fb90c1f12180ac552d93b
CLTokenInputView: 9dc1ffb7c9d2d81787e69a63c75bd97b0b2d1e76
Eureka: d014adf16406745e1a78d5790ea37ed130a0a8e5
TokenRow: 7362e08738e1ba31260a13f963d93e5115fd4568
Eureka: f36fd440c3ebb7bfea0a4fbe6f16a05f1cb35906
TokenRow: 1da149ba19993d80dfe8bbca783aa577121d59b4

PODFILE CHECKSUM: ae10cf141332d133506b562d6cf2f2ea98250b24
PODFILE CHECKSUM: 7c14795d8c60aa3f27a7c6ca1f8b31fd4c30ad19

COCOAPODS: 1.1.0.rc.2
COCOAPODS: 1.2.1

0 comments on commit 6aefd45

Please sign in to comment.