Skip to content

Commit

Permalink
Merge pull request #116 from ikesyo/release/2.0.0
Browse files Browse the repository at this point in the history
Release 2.0.0
  • Loading branch information
ikesyo committed Apr 12, 2016
2 parents a1d9dfe + f0d0887 commit ca6f795
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Himotoki.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Himotoki"
s.version = "2.0.0-beta.3"
s.version = "2.0.0"
s.summary = "A type-safe JSON decoding library purely written in Swift"
s.description = <<-DESC
Himotoki (紐解き) is a type-safe JSON decoding library purely written in Swift. This library is highly inspired by popular JSON parsing libraries in Swift: [Argo](https://github.com/thoughtbot/Argo) and [ObjectMapper](https://github.com/Hearst-DD/ObjectMapper).
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ struct Group: Decodable {
func testGroup() {
var JSON: [String: AnyObject] = [ "name": "Himotoki", "floor": 12 ]

let g: Group? = try? decodeValue(JSON)
let g = try? Group.decodeValue(JSON)
XCTAssert(g != nil)
XCTAssert(g?.name == "Himotoki")
XCTAssert(g?.floor == 12)
XCTAssert(g?.optional == nil)

JSON["name"] = nil
do {
try decodeValue(JSON) as Group
try Group.decodeValue(JSON)
} catch let DecodeError.MissingKeyPath(keyPath) {
XCTAssert(keyPath == "name")
} catch {
Expand Down Expand Up @@ -90,7 +90,7 @@ let otherURLs = try URLTransformer.apply(e <|| "bar_urls")

## Requirements

- Swift 2.1 / Xcode 7.2
- Swift 2.2 / Xcode 7.3
- OS X 10.9 or later
- iOS 8.0 or later (by Carthage or CocoaPods) / iOS 7 (by copying the source files directly)
- tvOS 9.0 or later
Expand All @@ -104,7 +104,7 @@ There are 3 options. If your app support iOS 7, you can only use the last way.

Himotoki is [Carthage](https://github.com/Carthage/Carthage) compatible.

- Add `github "ikesyo/Himotoki" ~> 1.7` to your Cartfile.
- Add `github "ikesyo/Himotoki" ~> 2.0` to your Cartfile.
- Run `carthage update`.

### Framework with CocoaPods
Expand All @@ -115,7 +115,7 @@ Himotoki also can be used by [CocoaPods](https://cocoapods.org/).

```ruby
use_frameworks!
pod "Himotoki", "~> 1.7"
pod "Himotoki", "~> 2.0"
```

- Run `pod install`.
Expand Down

0 comments on commit ca6f795

Please sign in to comment.