Merge pull request #331 from airbnb/btw/lottie201

Update to fix builds
airbnb · Aug 2, 2017 · 973ec4e · 973ec4e
2 parents 58443dc + 9fddf34
commit 973ec4e
Show file tree

Hide file tree

Showing 27 changed files with 299 additions and 289 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -10,6 +10,6 @@ target 'Lottie-Example' do
  end
 end
 
-target 'Lottie-Example-MacOS' do
+target 'Lottie Viewer' do
  pod 'lottie-ios', :path => '../'
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
- - lottie-ios (1.5.2)
+ - lottie-ios (2.0.0)
 
 DEPENDENCIES:
  - lottie-ios (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
  :path: "../"
 
 SPEC CHECKSUMS:
- lottie-ios: cee48dbb191cd4cda707b76aa822dd8342ac2c5d
+ lottie-ios: 7e7828153b1c6f0b508ccf08769aab7e1bee35a4
 
-PODFILE CHECKSUM: 6d1e1685b831b9c2307e9f025c2992df8d660bdb
+PODFILE CHECKSUM: fdbd59f361db8744871f0e9a0b3f94e0b7b8ca6b
 
 COCOAPODS: 1.1.1
diff --git a/Example/Pods/Local Podspecs/lottie-ios.podspec.json b/Example/Pods/Local Podspecs/lottie-ios.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...iles/Pods-Lottie-Example-MacOS/Info.plist → ...pport Files/Pods-Lottie Viewer/Info.plist b/...iles/Pods-Lottie-Example-MacOS/Info.plist → ...pport Files/Pods-Lottie Viewer/Info.plist
diff --git a/...e-Example-MacOS-acknowledgements.markdown → ...s-Lottie Viewer-acknowledgements.markdown b/...e-Example-MacOS-acknowledgements.markdown → ...s-Lottie Viewer-acknowledgements.markdown
diff --git a/...ttie-Example-MacOS-acknowledgements.plist → ...Pods-Lottie Viewer-acknowledgements.plist b/...ttie-Example-MacOS-acknowledgements.plist → ...Pods-Lottie Viewer-acknowledgements.plist
diff --git a/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-dummy.m b/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-dummy.m
diff --git a/...S/Pods-Lottie-Example-MacOS-frameworks.sh → ...e Viewer/Pods-Lottie Viewer-frameworks.sh b/...S/Pods-Lottie-Example-MacOS-frameworks.sh → ...e Viewer/Pods-Lottie Viewer-frameworks.sh
diff --git a/...OS/Pods-Lottie-Example-MacOS-resources.sh → ...ie Viewer/Pods-Lottie Viewer-resources.sh b/...OS/Pods-Lottie-Example-MacOS-resources.sh → ...ie Viewer/Pods-Lottie Viewer-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-umbrella.h b/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-umbrella.h
diff --git a/.../Pods-Lottie-Example-MacOS.debug.xcconfig → ... Viewer/Pods-Lottie Viewer.debug.xcconfig b/.../Pods-Lottie-Example-MacOS.debug.xcconfig → ... Viewer/Pods-Lottie Viewer.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer.modulemap b/Example/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer.modulemap
diff --git a/...ods-Lottie-Example-MacOS.release.xcconfig → ...iewer/Pods-Lottie Viewer.release.xcconfig b/...ods-Lottie-Example-MacOS.release.xcconfig → ...iewer/Pods-Lottie Viewer.release.xcconfig
diff --git a/...ple/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-dummy.m b/...ple/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-dummy.m
diff --git a/.../Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-umbrella.h b/.../Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-umbrella.h
diff --git a/...e/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS.modulemap b/...e/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS.modulemap
diff --git a/Example/Pods/Target Support Files/lottie-ios-OSX/Info.plist b/Example/Pods/Target Support Files/lottie-ios-OSX/Info.plist
diff --git a/Example/Pods/Target Support Files/lottie-ios-iOS/Info.plist b/Example/Pods/Target Support Files/lottie-ios-iOS/Info.plist
diff --git a/Example/lottie-ios.xcodeproj/project.pbxproj b/Example/lottie-ios.xcodeproj/project.pbxproj
@@ -82,6 +82,7 @@
  FA1F5A971E42B25500FF36BF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA1F5A961E42B25500FF36BF /* Assets.xcassets */; };
  FA1F5A9A1E42B25500FF36BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FA1F5A981E42B25500FF36BF /* Main.storyboard */; };
  FAFA304C27E35A5B877B245D /* Pods_Lottie_Example_MacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC7587B24F90B40ADD0CEA8C /* Pods_Lottie_Example_MacOS.framework */; };
+ FC6DFE4EE48E30E0517FE2B2 /* Pods_Lottie_Viewer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CED53248BEFE3C87F0FE12C7 /* Pods_Lottie_Viewer.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -100,6 +101,7 @@
  3B15EF764A3BC631B7F802E1 /* Pods_Lottie_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Lottie_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  48A852301E3A9E71000AD155 /* lottie_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lottie_logo.png; sourceTree = "<group>"; };
  4EBDFEA18138A27DD5A89337 /* Pods_lottie_ios_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_lottie_ios_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 5E30615D19045275700B4483 /* Pods-Lottie Viewer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lottie Viewer.release.xcconfig"; path = "Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer.release.xcconfig"; sourceTree = "<group>"; };
  6003F58A195388D20070C39A /* Lottie-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Lottie-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
  6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
  6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -182,9 +184,11 @@
  6DC4D284D6109D58EE331F86 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
  71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
  873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+ 8D60CC2FE869355D41580738 /* Pods-Lottie Viewer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lottie Viewer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer.debug.xcconfig"; sourceTree = "<group>"; };
  94B0A9361261413477E89F1E /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
  99F3982078CC5B93DA1AFF47 /* Pods-Lottie-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lottie-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Lottie-Example/Pods-Lottie-Example.debug.xcconfig"; sourceTree = "<group>"; };
  AC7587B24F90B40ADD0CEA8C /* Pods_Lottie_Example_MacOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Lottie_Example_MacOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ CED53248BEFE3C87F0FE12C7 /* Pods_Lottie_Viewer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Lottie_Viewer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  D8C83F4B06A893EA3322E53A /* Pods-Lottie-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lottie-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Lottie-Example/Pods-Lottie-Example.release.xcconfig"; sourceTree = "<group>"; };
  FA1F5A8B1E42B25500FF36BF /* Lottie Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Lottie Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
  FA1F5A8D1E42B25500FF36BF /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -226,6 +230,7 @@
  buildActionMask = 2147483647;
  files = (
  FAFA304C27E35A5B877B245D /* Pods_Lottie_Example_MacOS.framework in Frameworks */,
+ FC6DFE4EE48E30E0517FE2B2 /* Pods_Lottie_Viewer.framework in Frameworks */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
@@ -241,6 +246,8 @@
  D8C83F4B06A893EA3322E53A /* Pods-Lottie-Example.release.xcconfig */,
  6BC326E3835099034E161393 /* Pods-Lottie-Example-MacOS.debug.xcconfig */,
  687661C57667AB2C5371F7BB /* Pods-Lottie-Example-MacOS.release.xcconfig */,
+ 8D60CC2FE869355D41580738 /* Pods-Lottie Viewer.debug.xcconfig */,
+ 5E30615D19045275700B4483 /* Pods-Lottie Viewer.release.xcconfig */,
  );
  name = Pods;
  sourceTree = "<group>";
@@ -279,6 +286,7 @@
  4EBDFEA18138A27DD5A89337 /* Pods_lottie_ios_Tests.framework */,
  3B15EF764A3BC631B7F802E1 /* Pods_Lottie_Example.framework */,
  AC7587B24F90B40ADD0CEA8C /* Pods_Lottie_Example_MacOS.framework */,
+ CED53248BEFE3C87F0FE12C7 /* Pods_Lottie_Viewer.framework */,
  );
  name = Frameworks;
  sourceTree = "<group>";
@@ -706,7 +714,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
  93F98080B14B4970E25D8A90 /* [CP] Copy Pods Resources */ = {
@@ -721,7 +729,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lottie-Example-MacOS/Pods-Lottie-Example-MacOS-resources.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lottie Viewer/Pods-Lottie Viewer-resources.sh\"\n";
  showEnvVarsInLog = 0;
  };
  A217B136975F8584F3390B8E /* [CP] Check Pods Manifest.lock */ = {
@@ -1006,7 +1014,7 @@
  };
  FA1F5A9C1E42B25500FF36BF /* Debug */ = {
  isa = XCBuildConfiguration;
- baseConfigurationReference = 6BC326E3835099034E161393 /* Pods-Lottie-Example-MacOS.debug.xcconfig */;
+ baseConfigurationReference = 8D60CC2FE869355D41580738 /* Pods-Lottie Viewer.debug.xcconfig */;
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CLANG_ANALYZER_NONNULL = YES;
@@ -1031,7 +1039,7 @@
  };
  FA1F5A9D1E42B25500FF36BF /* Release */ = {
  isa = XCBuildConfiguration;
- baseConfigurationReference = 687661C57667AB2C5371F7BB /* Pods-Lottie-Example-MacOS.release.xcconfig */;
+ baseConfigurationReference = 5E30615D19045275700B4483 /* Pods-Lottie Viewer.release.xcconfig */;
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CLANG_ANALYZER_NONNULL = YES;

diff --git a/Lottie-Screenshot/Podfile.lock b/Lottie-Screenshot/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
  - FBSnapshotTestCase/Core (2.1.4)
- - lottie-ios (1.5.2)
+ - lottie-ios (2.0.0)
 
 DEPENDENCIES:
  - FBSnapshotTestCase/Core
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
- lottie-ios: cee48dbb191cd4cda707b76aa822dd8342ac2c5d
+ lottie-ios: 7e7828153b1c6f0b508ccf08769aab7e1bee35a4
 
 PODFILE CHECKSUM: 3901ca88392ceeedc459164e7080c5f357e54e04
 

diff --git a/Lottie-Screenshot/Pods/Local Podspecs/lottie-ios.podspec.json b/Lottie-Screenshot/Pods/Local Podspecs/lottie-ios.podspec.json
diff --git a/Lottie-Screenshot/Pods/Manifest.lock b/Lottie-Screenshot/Pods/Manifest.lock
diff --git a/lottie-ios.podspec b/lottie-ios.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'lottie-ios'
- s.version = '2.0.0'
+ s.version = '2.0.1'
  s.summary = 'Used to natively render vector animations exported from After Effects.'
 
  s.description = <<-DESC

diff --git a/lottie-ios/Classes/PublicHeaders/Lottie.h b/lottie-ios/Classes/PublicHeaders/Lottie.h
@@ -28,5 +28,7 @@ FOUNDATION_EXPORT const unsigned char LottieVersionString[];
 #endif
 
 #import "LOTAnimationView.h"
+#import "LOTAnimationCache.h"
+#import "LOTComposition.h"
 
 #endif /* Lottie_h */
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lottie-ios",
- "version": "2.0.0",
+ "version": "2.0.1",
  "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": {