Skip to content

Commit

Permalink
Merge pull request #12 from Lightricks/feature/rename-legacy
Browse files Browse the repository at this point in the history
Rename to Lottie-Legacy.
  • Loading branch information
barakwei authored Dec 16, 2022
2 parents 847cf1e + 0104767 commit b27c0c2
Show file tree
Hide file tree
Showing 14 changed files with 121 additions and 116 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/[email protected]
with:
xcode-version: '13.4.1'
xcode-version: '14.1'

- name: Checkout repo
uses: actions/checkout@v2
Expand All @@ -22,8 +22,8 @@ jobs:
- name: Build and Run Tests
run: fastlane scan
env:
SCAN_DEVICE: iPhone 12
SCAN_SCHEME: Lottie
SCAN_DEVICE: iPhone 14
SCAN_SCHEME: Lottie-Legacy

- name: Upload result bundle
uses: actions/upload-artifact@v2
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ Example/lottie-ios.xcodeproj/xcuserdata
Example/lottie-ios.xcodeproj/xcuserdata
Example-Swift/Pods/Pods.xcodeproj/xcuserdata/
Example-Swift/Lottie-Example-Swift.xcodeproj/xcuserdata/
.DS_Store

## User settings
xcuserdata/

## macOS
.DS_Store

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "62CA59B71E3C173B002D7188"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_iOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_iOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,9 +33,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D831E39D291AAC5D00463017"
BuildableName = "LottieTests.xctest"
BlueprintName = "LottieTests"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-LegacyTests.xctest"
BlueprintName = "Lottie-LegacyTests"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -54,9 +54,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "62CA59B71E3C173B002D7188"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_iOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_iOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
Expand All @@ -70,9 +70,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "62CA59B71E3C173B002D7188"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_iOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_iOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FAE1F79C1E428CBE002E0974"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_macOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_macOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -44,9 +44,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FAE1F79C1E428CBE002E0974"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_macOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_macOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
Expand All @@ -60,9 +60,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FAE1F79C1E428CBE002E0974"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_macOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_macOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8C5378FE1FB471D100C1BC65"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_tvOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_tvOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -44,9 +44,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8C5378FE1FB471D100C1BC65"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_tvOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_tvOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
Expand All @@ -60,9 +60,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8C5378FE1FB471D100C1BC65"
BuildableName = "Lottie.framework"
BlueprintName = "Lottie_tvOS"
ReferencedContainer = "container:Lottie.xcodeproj">
BuildableName = "Lottie-Legacy.framework"
BlueprintName = "Lottie-Legacy_tvOS"
ReferencedContainer = "container:Lottie-Legacy.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
2 changes: 1 addition & 1 deletion lottie-ios/Classes/PublicHeaders/LOTAnimatedSwitch.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2017 Airbnb. All rights reserved.
//

#import <Lottie/LOTAnimatedControl.h>
#import <Lottie-Legacy/LOTAnimatedControl.h>

NS_ASSUME_NONNULL_BEGIN

Expand Down
8 changes: 4 additions & 4 deletions lottie-ios/Classes/PublicHeaders/LOTAnimationView.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
// Dream Big.

#import <Foundation/Foundation.h>
#import <Lottie/LOTAnimationView_Compat.h>
#import <Lottie/LOTComposition.h>
#import <Lottie/LOTKeypath.h>
#import <Lottie/LOTValueDelegate.h>
#import <Lottie-Legacy/LOTAnimationView_Compat.h>
#import <Lottie-Legacy/LOTComposition.h>
#import <Lottie-Legacy/LOTKeypath.h>
#import <Lottie-Legacy/LOTValueDelegate.h>

typedef void (^LOTAnimationCompletionBlock)(BOOL animationFinished);

Expand Down
2 changes: 1 addition & 1 deletion lottie-ios/Classes/PublicHeaders/LOTBlockCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <Lottie/LOTValueDelegate.h>
#import <Lottie-Legacy/LOTValueDelegate.h>

/*!
@brief A block that is used to change a Color value at keytime, the block is called continuously for a keypath while the aniamtion plays.
Expand Down
2 changes: 1 addition & 1 deletion lottie-ios/Classes/PublicHeaders/LOTInterpolatorCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <Lottie/LOTValueDelegate.h>
#import <Lottie-Legacy/LOTValueDelegate.h>

/*!
@brief LOTPointInterpolatorCallback is a container for a CGPointRef. This container is a LOTPointValueDelegate that will return the point interpolated at currentProgress between fromPoint and toPoint. Externally changing currentProgress will change the point of the animation.
Expand Down
2 changes: 1 addition & 1 deletion lottie-ios/Classes/PublicHeaders/LOTValueCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <Lottie/LOTValueDelegate.h>
#import <Lottie-Legacy/LOTValueDelegate.h>

/*!
@brief LOTColorValueCallback is a container for a CGColorRef. This container is a LOTColorValueDelegate that always returns the colorValue property to its animation delegate.
Expand Down
22 changes: 11 additions & 11 deletions lottie-ios/Classes/PublicHeaders/Lottie.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ FOUNDATION_EXPORT const unsigned char LottieVersionString[];
#include <TargetConditionals.h>

#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
#import <Lottie/LOTAnimationTransitionController.h>
#import <Lottie/LOTAnimatedSwitch.h>
#import <Lottie/LOTAnimatedControl.h>
#import <Lottie-Legacy/LOTAnimationTransitionController.h>
#import <Lottie-Legacy/LOTAnimatedSwitch.h>
#import <Lottie-Legacy/LOTAnimatedControl.h>
#endif

#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
#import <Lottie/LOTCacheProvider.h>
#import <Lottie-Legacy/LOTCacheProvider.h>
#endif

#import <Lottie/LOTAnimationView.h>
#import <Lottie/LOTAnimationCache.h>
#import <Lottie/LOTComposition.h>
#import <Lottie/LOTBlockCallback.h>
#import <Lottie/LOTInterpolatorCallback.h>
#import <Lottie/LOTValueCallback.h>
#import <Lottie/LOTValueDelegate.h>
#import <Lottie-Legacy/LOTAnimationView.h>
#import <Lottie-Legacy/LOTAnimationCache.h>
#import <Lottie-Legacy/LOTComposition.h>
#import <Lottie-Legacy/LOTBlockCallback.h>
#import <Lottie-Legacy/LOTInterpolatorCallback.h>
#import <Lottie-Legacy/LOTValueCallback.h>
#import <Lottie-Legacy/LOTValueDelegate.h>

#endif /* Lottie_h */

0 comments on commit b27c0c2

Please sign in to comment.