Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.0.7 Migrate to support #1300

Closed
wants to merge 6 commits into from
Closed

3.0.7 Migrate to support #1300

wants to merge 6 commits into from

Conversation

gentrio
Copy link

@gentrio gentrio commented Jul 2, 2019

#1234 make a branch from 3.0.7 and revert the androidx migration

This reverts commit c476cc6.

# Conflicts:
#	LottieSample/build.gradle
#	LottieSample/src/androidTest/java/com/airbnb/lottie/LottieSnapshotProvider.java
#	LottieSample/src/androidTest/java/com/airbnb/lottie/LottieTest.java
#	LottieSample/src/main/kotlin/com/airbnb/lottie/samples/LottieApplication.kt
#	LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PlayerFragment.kt
#	LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/NoShiftBottomNavigationView.kt
#	build.gradle
#	lottie/build.gradle
#	lottie/src/main/java/com/airbnb/lottie/L.java
#	lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
#	lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
#	lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java
#	lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
#	lottie/src/main/java/com/airbnb/lottie/LottieTask.java
#	lottie/src/main/java/com/airbnb/lottie/animation/content/BaseStrokeContent.java
#	lottie/src/main/java/com/airbnb/lottie/animation/content/EllipseContent.java
#	lottie/src/main/java/com/airbnb/lottie/animation/content/GradientStrokeContent.java
#	lottie/src/main/java/com/airbnb/lottie/animation/content/RectangleContent.java
#	lottie/src/main/java/com/airbnb/lottie/animation/content/ShapeContent.java
#	lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
#	lottie/src/main/java/com/airbnb/lottie/animation/keyframe/TransformKeyframeAnimation.java
#	lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTransform.java
#	lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java
#	lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
#	lottie/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
#	lottie/src/main/java/com/airbnb/lottie/parser/ContentModelParser.java
#	lottie/src/main/java/com/airbnb/lottie/parser/GradientColorParser.java
#	lottie/src/main/java/com/airbnb/lottie/parser/JsonUtils.java
#	lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
#	lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionParser.java
#	lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
#	lottie/src/test/java/com/airbnb/lottie/LottieCompositionFactoryTest.java
# Conflicts:
#	lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@gpeal
Copy link
Collaborator

gpeal commented Jul 2, 2019

Snapshots Failed

@gpeal
Copy link
Collaborator

gpeal commented Jul 2, 2019

Snapshots Failed

@gpeal
Copy link
Collaborator

gpeal commented Jul 2, 2019

Snapshots Failed

@gentrio gentrio closed this Jul 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants