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

Flavor support #21551

Merged
merged 65 commits into from
Aug 11, 2023
Merged

Flavor support #21551

merged 65 commits into from
Aug 11, 2023

Commits on Apr 11, 2023

  1. add flavors

    @staszekscp
    staszekscp committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    7bcbb8b View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. support flavors on android

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    b84fefe View commit details
    Browse the repository at this point in the history

  2. fix name

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    c2189e4 View commit details
    Browse the repository at this point in the history

  3. improve android splashscreen

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    991ed02 View commit details
    Browse the repository at this point in the history

  4. fix android script in package.json

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    f9f7a9a View commit details
    Browse the repository at this point in the history

  5. fix last lines

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    6e6c1ff View commit details
    Browse the repository at this point in the history

  6. fix fastfile

    @staszekscp
    staszekscp committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    6274443 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Merge branch 'main' into flavor-support

    @staszekscp
    staszekscp committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    fc4f72a View commit details
    Browse the repository at this point in the history

  2. add basic scheme support for ios

    @staszekscp
    staszekscp committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    4c4ae64 View commit details
    Browse the repository at this point in the history

  3. add icon to schemes

    @staszekscp
    staszekscp committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    d5e9a41 View commit details
    Browse the repository at this point in the history

  4. fix package.json

    @staszekscp
    staszekscp committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    a2bd8a0 View commit details
    Browse the repository at this point in the history

  5. add .env detection

    @staszekscp
    staszekscp committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    70545fe View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Merge branch 'main' into flavor-support

    @staszekscp
    staszekscp committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    2d23f8a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Merge branch 'main' into flavor-support

    @staszekscp
    staszekscp committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    3aa64ff View commit details
    Browse the repository at this point in the history

  2. merge

    @staszekscp
    staszekscp committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    13f8dd5 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Merge branch 'main' into flavor-support

    @mczernek
    mczernek committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e0449f9 View commit details
    Browse the repository at this point in the history

  2. Remove unnecesary buildTypes and flavors, add e2e flavor.

    @mczernek
    mczernek committed May 26, 2023
    Configuration menu
    Copy the full SHA
    f4f3113 View commit details
    Browse the repository at this point in the history

  3. Remove Staging from iOS.

    @mczernek
    mczernek committed May 26, 2023
    Configuration menu
    Copy the full SHA
    71dbe1e View commit details
    Browse the repository at this point in the history

  4. Remove staging from some leftovers.

    @mczernek
    mczernek committed May 26, 2023
    Configuration menu
    Copy the full SHA
    3e3b345 View commit details
    Browse the repository at this point in the history

  5. Fix Fastlane according to new flavors/buildTypes configuration.

    @mczernek
    mczernek committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e353839 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	ios/Podfile.lock
#	package.json
    @kowczarz
    kowczarz committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    aa383d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Add icons based on flavour to splash screen

    @kowczarz
    kowczarz committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    047adac View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Disable unused android build variants

    @kowczarz
    kowczarz committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    097adf4 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Fix splash screen icon based on app flavour

    @kowczarz
    kowczarz committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    ca982f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	src/components/SplashScreenHider/index.native.js
    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    26470c2 View commit details
    Browse the repository at this point in the history

  2. Update env configuration

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    4c0b60f View commit details
    Browse the repository at this point in the history

  3. Update env configuration for e2e flavor

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    ca85783 View commit details
    Browse the repository at this point in the history

  4. Typo

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    dfa2d9c View commit details
    Browse the repository at this point in the history

  5. Remove unused assets

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    6cea881 View commit details
    Browse the repository at this point in the history

  6. Fix lint issues

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    2c5174a View commit details
    Browse the repository at this point in the history

  7. Fix build gradle

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    df78bfb View commit details
    Browse the repository at this point in the history

  8. Fix podfile issues

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    8397672 View commit details
    Browse the repository at this point in the history

  9. Move bootsplash files to specific directories

    @kowczarz
    kowczarz committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    e85a760 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support

    @kowczarz
    kowczarz committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    8b77667 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Add xcode selection for iOS fastlane

    @kowczarz
    kowczarz committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    defc4b9 View commit details
    Browse the repository at this point in the history

  2. Fix filename typo

    @kowczarz
    kowczarz committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    768c27d View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	fastlane/Fastfile
    @kowczarz
    kowczarz committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    30a30a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Change signing config for non-production flavors on android

    @kowczarz
    kowczarz committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7df7319 View commit details
    Browse the repository at this point in the history

  2. Force latest xcode version in GitHub Action

    @kowczarz
    kowczarz committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    84d015c View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Bump up xcode

    @kowczarz
    kowczarz committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    0cba771 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	ios/Podfile.lock
#	package.json
    @kowczarz
    kowczarz committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    c0e604e View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Update Fastfile for ad-hoc provisioning

    @kowczarz
    kowczarz committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d43e1ed View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'expensify/main' into flavor-support

    @kowczarz
    kowczarz committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    746ac8a View commit details
    Browse the repository at this point in the history

  3. Updated podfile lock

    @kowczarz
    kowczarz committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    fd8e2a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	package.json
    @kowczarz
    kowczarz committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    23ba779 View commit details
    Browse the repository at this point in the history

  2. Fix pbxproj issues

    @kowczarz
    kowczarz committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    b4e0aef View commit details
    Browse the repository at this point in the history

  3. Fix dev and adhoc icon sets

    @kowczarz
    kowczarz committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    04406ea View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'expensify/main' into flavor-support

    @kowczarz
    kowczarz committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3b0d03e View commit details
    Browse the repository at this point in the history

  5. Add flavor indication on AboutPage.js

    @kowczarz
    kowczarz committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    5e19ef7 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Fix android icons

    @kowczarz
    kowczarz committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    b4dd6fe View commit details
    Browse the repository at this point in the history

  2. Fix android round icons

    @kowczarz
    kowczarz committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    93fbc24 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support

    @kowczarz
    kowczarz committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c873052 View commit details
    Browse the repository at this point in the history

  2. Update bundle id and provisioning profile for dev builds

    @kowczarz
    kowczarz committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    2b6f665 View commit details
    Browse the repository at this point in the history

  3. Add app id suffix for android e2e build

    @kowczarz
    kowczarz committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ae49ac2 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Fix production logo flashing

    @kowczarz
    kowczarz committed Aug 1, 2023
    1 Configuration menu
    Copy the full SHA
    282105f View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Revert different splash screens on Android

    @kowczarz
    kowczarz committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    aee92d4 View commit details
    Browse the repository at this point in the history

  2. Revert "Remove unused assets"

    @kowczarz
    kowczarz committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    8035662 View commit details
    Browse the repository at this point in the history

  3. Fix lint issue

    @kowczarz
    kowczarz committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    24724fe View commit details
    Browse the repository at this point in the history

  4. Remove unused file

    @kowczarz
    kowczarz committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    291ec29 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge remote-tracking branch 'expensify/main' into flavor-support 

    # Conflicts:
#	android/app/build.gradle
#	ios/NewExpensify.xcodeproj/project.pbxproj
#	ios/Podfile.lock
    @kowczarz
    kowczarz committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    667b9b1 View commit details
    Browse the repository at this point in the history

  2. Fix pods

    @kowczarz
    kowczarz committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9b9ae17 View commit details
    Browse the repository at this point in the history

  3. Small nits in build.gradle

    @kowczarz
    kowczarz committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    b1a8f74 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Fix logo issue

    @kowczarz
    kowczarz committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    d6ccac1 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Update missing setup in build.gradle

    @kowczarz
    kowczarz committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    69923ac View commit details
    Browse the repository at this point in the history

  2. Typo

    @kowczarz
    kowczarz committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    ffc1db5 View commit details
    Browse the repository at this point in the history