search

nativescript-community / ui-lottie

NativeScript plugin to expose Airbnb Lottie
https://github.com/airbnb/lottie-android
Other
177 stars 57 forks source link

{N}3, Angular Support, Update to latest native libraries versions #11

Closed rhanb closed 6 years ago

rhanb commented 6 years ago

Update tns-core-modules to support NS3 Properties binding done should work under Angular, Vue, {N} Observables etc.. Updated Podfile and include.gradle to download the latest version of the native library

bradmartin commented 6 years ago

@rhanb - can you fix the package.json conflict?

rhanb commented 6 years ago

@bradmartin ,

I'm trying but keep saying to me: (after trying 5 times)

This page is out of date. Start over

Remove the second one: 

<<<<<<< master
    "debug.android": "npm run preparedemo && cd demo && tns debug android --emulator",
    "preparedemong": "npm run build && cd demo-ng && tns plugin remove nativescript-lottie && tns plugin add ../ && tns install",
    "preparedemo": "npm run build && cd demo && tns plugin remove nativescript-lottie && tns plugin add .. && tns install",
    "setup": "cd demo && npm install && cd .. && npm run build && cd demo && tns plugin add .. && cd ..",
=======
    "debug.android":
      "npm run preparedemo && cd demo && tns debug android --emulator",
    "preparedemo":
      "npm run build && cd demo && tns plugin remove nativescript-lottie && tns plugin add .. && tns install",
    "setup":
      "cd demo && npm install && cd .. && npm run build && cd demo && tns plugin add .. && cd ..",
>>>>>>> master

To have:

    "debug.android": "npm run preparedemo && cd demo && tns debug android --emulator",
    "preparedemong": "npm run build && cd demo-ng && tns plugin remove nativescript-lottie && tns plugin add ../ && tns install",
    "preparedemo": "npm run build && cd demo && tns plugin remove nativescript-lottie && tns plugin add .. && tns install",
    "setup": "cd demo && npm install && cd .. && npm run build && cd demo && tns plugin add .. && cd ..",
bradmartin commented 6 years ago

I get the same error 😞

rhanb commented 6 years ago

@bradmartin wtf?! lol

bradmartin commented 6 years ago

Maybe close this one, resolve it locally and open a new PR 🤔 - isn't git amazing

rhanb commented 6 years ago

When pulling I don't get any conflict - that's maybe why we can't resolve the conflicts they already are somehow