Skip to content

Commit

Permalink
Merge pull request airbnb#127 from airbnb/btw/1.5.0
Browse files Browse the repository at this point in the history
Updating to 1.5.0
  • Loading branch information
buba447 committed Feb 24, 2017
2 parents b110718 + 97dd527 commit ca839b8
Show file tree
Hide file tree
Showing 32 changed files with 830 additions and 905 deletions.
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- lottie-ios (1.0.0)
- lottie-ios (1.5.0)

DEPENDENCIES:
- lottie-ios (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
lottie-ios: 446088d623e3c1d764b212bcd51a5f15147f9a6e
lottie-ios: 5334f451dcdff5e58b61ffd4269102831e6100b5

PODFILE CHECKSUM: 6d1e1685b831b9c2307e9f025c2992df8d660bdb

COCOAPODS: 1.2.0.rc.1
COCOAPODS: 1.1.1
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/lottie-ios.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,590 changes: 800 additions & 790 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Lottie-Screenshot/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- FBSnapshotTestCase/Core (2.1.4)
- lottie-ios (1.0.4)
- lottie-ios (1.5.0)

DEPENDENCIES:
- FBSnapshotTestCase/Core
Expand All @@ -12,7 +12,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
lottie-ios: 8b2c5ba38105430a72f03ce54be90d8dac950161
lottie-ios: 5334f451dcdff5e58b61ffd4269102831e6100b5

PODFILE CHECKSUM: 3901ca88392ceeedc459164e7080c5f357e54e04

Expand Down
4 changes: 2 additions & 2 deletions Lottie-Screenshot/Pods/Local Podspecs/lottie-ios.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Lottie-Screenshot/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lottie-ios.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'lottie-ios'
s.version = '1.0.4'
s.version = '1.5.0'
s.summary = 'Used to natively render vector animations exported from After Effects.'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lottie-ios",
"version": "1.0.5",
"version": "1.5.0",
"description": "Lottie is a mobile library for Android and iOS that parses Adobe After Effects animations exported as json with bodymovin and renders the vector animations natively on mobile and through React Native!",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit ca839b8

Please sign in to comment.