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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-24446](6_1_X) Allow replacing bundled Android Support Libraries #9070

Merged
merged 9 commits into from
May 23, 2017
Merged

[TIMOB-24446](6_1_X) Allow replacing bundled Android Support Libraries #9070

merged 9 commits into from
May 23, 2017

Commits on May 17, 2017

  1. [TIMOB-24446] Allow replacing bundled Android Support Libraries

    @janvennemann
    janvennemann committed May 17, 2017
    Configuration menu
    Copy the full SHA
    eaa1721 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. [TIMOB-24446] Add exclusion logic for bundled Android Support Libraries

    @janvennemann
    janvennemann committed May 18, 2017
    Configuration menu
    Copy the full SHA
    3b27f10 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. Merge branch '6_1_X' into TIMOB-24446-6_1_X

    @garymathews
    garymathews committed May 19, 2017
    Configuration menu
    Copy the full SHA
    f353068 View commit details
    Browse the repository at this point in the history

  2. [TIMOB-24446] Split for both line-endings

    @janvennemann
    janvennemann committed May 19, 2017
    Configuration menu
    Copy the full SHA
    2943aef View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/TIMOB-24446-6_1_X' into TIMOB-24… 

    …446-6_1_X
    @janvennemann
    janvennemann committed May 19, 2017
    Configuration menu
    Copy the full SHA
    31f1637 View commit details
    Browse the repository at this point in the history

  4. Update base-builder.js

    @hansemannn
    hansemannn committed May 19, 2017
    Configuration menu
    Copy the full SHA
    ca98cec View commit details
    Browse the repository at this point in the history

Commits on May 23, 2017

  1. [TIMOB-24446] Remove duplicate dexer paths in Hyperloop 2.1.0 

    Fixes an issue with Hyperloop 2.1.0 which causes a crash when trying to override the Android Support Libraries with local .aar files. Hyperloop 2.1.0 will always manually add our bundled Android Support Libraries to the dexer paths even if they were replaced by the builder. To fix this we check the altered dexer paths again and remove any replaced libraries.
    @janvennemann
    janvennemann committed May 23, 2017
    Configuration menu
    Copy the full SHA
    b349a7c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/TIMOB-24446-6_1_X' into TIMOB-24… 

    …446-6_1_X
    @janvennemann
    janvennemann committed May 23, 2017
    Configuration menu
    Copy the full SHA
    f4b5a1a View commit details
    Browse the repository at this point in the history

  3. Merge branch '6_1_X' into TIMOB-24446-6_1_X

    @hansemannn
    hansemannn committed May 23, 2017
    Configuration menu
    Copy the full SHA
    d18b301 View commit details
    Browse the repository at this point in the history