Skip to content
This repository has been archived by the owner on Sep 19, 2018. It is now read-only.

Commit

Permalink
Merge pull request #160 from bignerdranch/zwaldowski/2-1-0_release
Browse files Browse the repository at this point in the history
Bump numbers for 2.1.0 release
  • Loading branch information
zwaldowski committed Apr 27, 2016
2 parents c608942 + bc5e185 commit 3879785
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Configurations/Base.xcconfig
Expand Up @@ -27,7 +27,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
GCC_WARN_UNDECLARED_SELECTOR = YES
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR

CURRENT_PROJECT_VERSION = 1
CURRENT_PROJECT_VERSION = 2.1.0
VERSION_INFO_PREFIX =
VERSIONING_SYSTEM = apple-generic

Expand Down
2 changes: 1 addition & 1 deletion Configurations/publish_docs.sh
Expand Up @@ -2,7 +2,7 @@

if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
echo -e "Generating Jazzy output \n"
jazzy --swift-version 2.1.1 -m Freddy -g "https://github.com/bignerdranch/Freddy" -a "Big Nerd Ranch" -u "https://github.com/bignerdranch" --module-version=2.0.0 -r "http://bignerdranch.github.io/Freddy/"
jazzy --swift-version 2.2 -m Freddy -g "https://github.com/bignerdranch/Freddy" -a "Big Nerd Ranch" -u "https://github.com/bignerdranch" --module-version=2.1.0 -r "http://bignerdranch.github.io/Freddy/"

echo -e "Moving into docs directory \n"
pushd docs
Expand Down
2 changes: 1 addition & 1 deletion Freddy.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "Freddy"
s.version = "2.0.2"
s.version = "2.1.0"
s.summary = "A JSON parsing library written in Swift"

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -195,7 +195,7 @@ You have a few different options to install Freddy.
Add us to your `Cartfile`:

```
github "bignerdranch/Freddy" ~> 2.0
github "bignerdranch/Freddy" ~> 2.1
```

After running `carthage bootstrap`, add `Freddy.framework` to the "Linked Frameworks and Libraries" panel of your application target. [Read more](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application).
Expand Down

0 comments on commit 3879785

Please sign in to comment.