I’m not sure what you are referring to. Do you mean the merge conflicts? I’m pretty sure there is more than one class which has conflicts. Carlos is right that there could be lot of classes which need resolution, but I’m not sure what the right answer is.
We might need to go through all the classes manually and check them… > On Sep 2, 2018, at 2:34 PM, Piotr Zarzycki <piotrzarzyck...@gmail.com> wrote: > > Hi Carlos, > > Please let's do not make such drastical steps. It looks like Harbs found > where the issue is. > > Let's make the changes and see whether it is working. > > Harbs can you do this? > > Thanks, > Piotr > > On Sun, Sep 2, 2018, 12:42 PM Harbs <harbs.li...@gmail.com> wrote: > >> To tell you the truth, I don’t understand exactly how the tokens are >> working, but the $ prefix definitely breaks it. >> >> I’m guessing the brackets is an XML construct recognized as a variable in >> things like E4X. >> >> Harbs >> >>> On Sep 2, 2018, at 1:30 PM, Carlos Rovira <carlosrov...@apache.org> >> wrote: >>> >>> Hi Habs, >>> >>> El dom., 2 sept. 2018 a las 11:42, Harbs (<harbs.li...@gmail.com>) >> escribió: >>> >>>> I found the problem. >>>> >>>> Carlos, I don’t know why you changed the tokens in the config files, but >>>> changing them made them unrecognized and caused the FlexUnit tests to >> fail. >>>> >>>> >>> I thought the tokens you refer was not correctly setup, since doesn't >> have >>> the $ symbol and this way those are not interpreted and changed by maven. >>> What I tried to do is fix maven build distribution. When I create a SDK >> vía >>> Maven, I get flex-config.xml and other files with >>> >>> >>> >> <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element> >>> >>> instead of >>> >>> <path-element>libs/path/20.0/playerglobal.swc</path-element> >>> >>> that is what IDEs expect. >>> >>> Maybe this is not the way to get this? if not how could we get maven >>> generates those files?. In the other hand, Can FlexUnit change to >> recognize >>> token with $ prefix? >>> >>> Thanks >>> >>> >>> -- >>> Carlos Rovira >>> http://about.me/carlosrovira >> >>