From baabebd40d76133ecd4ffe13f75ca3e7887b9ba2 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Mon, 7 Aug 2023 20:17:08 +0100 Subject: [PATCH] Refactor flavours (#17) - Fastlane completed - Circleci config completed - Flavours build completed --- .circleci/config.yml | 166 ++++++++++-------- .gitignore | 8 + .idea/androidTestResultsUserPreferences.xml | 113 ++++++++++++ .idea/codeStyles/Project.xml | 24 +-- .idea/kotlinc.xml | 6 + .idea/navEditor.xml | 21 +++ Gemfile | 3 + app/build.gradle | 42 +++-- .../appttude/h_mal/atlas_weather/BaseTest.kt | 90 ++++++++++ .../{utils => }/BaseTestRobot.kt | 17 +- .../h_mal/atlas_weather/BaseUiTest.kt | 141 --------------- .../h_mal/atlas_weather/helpers/Constants.kt | 14 -- .../{ => helpers}/CustomViewMatchers.kt | 2 +- .../h_mal/atlas_weather/helpers/DataHelper.kt | 33 ---- .../LocationProviderImplTest.kt | 3 +- .../monoWeather/testsuite/BaseTest.kt | 67 ------- .../testsuite/HomePageUITestScenario.kt | 84 --------- .../WidgetLocationPermissionActivityTest.kt | 30 ---- .../atlas_weather/robot/HomeScreenRobot.kt | 2 +- .../atlas_weather/tests/HomePageUITest.kt | 17 +- .../atlas_weather/tests/HomePageUITest.kt | 25 --- .../h_mal/monoWeather/MonoBaseTest.kt | 20 +++ .../robot/HomeScreenRobot.kt | 4 +- .../robot/WidgetPermissionScreenRobot.kt | 11 ++ .../h_mal/monoWeather/tests/HomePageUITest.kt | 22 +++ .../WidgetLocationPermissionActivityTest.kt | 26 +++ app/src/atlasWeather/AndroidManifest.xml | 21 +-- .../atlasWeather/ui/BaseFragment.kt | 55 ------ .../atlasWeather/ui/MainActivity.kt | 65 ------- .../atlasWeather/ui/home/HomeFragment.kt | 99 ----------- .../ui/settings/UnitSettingsActivity.kt | 88 ---------- .../atlasWeather/widget/BaseWidgetClass.kt | 38 ---- .../widget/MyWidgetRemoteViewsFactory.kt | 77 -------- .../atlasWeather/widget/NewAppWidget.kt | 141 --------------- .../widget/WidgetRemoteViewsService.kt | 10 -- .../atlasWeather/widget/WidgetUtils.kt | 15 -- .../notification/NotificationData.kt | 2 +- .../notification/NotificationReceiver.kt | 7 +- .../{atlasWeather => }/ui/BaseActivity.kt | 2 +- .../appttude/h_mal/atlas_weather/ui/Tabs.kt | 5 + .../ui/WorldItemFragment.kt | 4 +- .../ui/details/FurtherInfoFragment.kt | 2 +- .../ui}/dialog/DeclarationBuilder.kt | 3 +- .../dialog/PermissionsDeclarationDialog.kt | 5 +- .../atlas_weather/ui/home/HomeFragment.kt | 109 ++++++++++++ .../ui/home/adapter/EmptyViewHolder.kt | 2 +- .../ui/home/adapter/ViewHolderCurrent.kt | 2 +- .../ui/home/adapter/ViewHolderForecast.kt | 2 +- .../home/adapter/ViewHolderFurtherDetails.kt | 2 +- .../ui/home/adapter/WeatherRecyclerAdapter.kt | 2 +- .../ui/settings/SettingsFragment.kt | 61 +++++++ .../ui/world/AddLocationFragment.kt | 16 +- .../ui/world/WorldFragment.kt | 19 +- .../ui/world/WorldRecyclerAdapter.kt | 2 +- .../atlasWeather/res/drawable/gradient.xml | 10 ++ .../atlasWeather/res/font/archeologicaps.ttf | Bin 0 -> 199668 bytes .../res/layout/list_item_current.xml | 2 +- .../res/layout/list_item_forecast.xml | 4 +- .../res/navigation/main_navigation.xml | 38 ++-- app/src/atlasWeather/res/values/colors.xml | 12 ++ app/src/atlasWeather/res/values/styles.xml | 17 +- .../res/xml/new_app_widget_info.xml | 2 +- app/src/main/AndroidManifest.xml | 7 +- .../atlas_weather/application/AppClass.kt | 15 -- .../data/location/LocationProviderImpl.kt | 2 +- .../networkUtils/RetrofitComponents.kt | 1 - .../atlas_weather/model/forecast/Forecast.kt | 101 ++++++----- .../model/forecast/WeatherDisplay.kt | 116 ++++++++---- .../atlas_weather/model/weather/Current.kt | 75 ++++---- .../model/weather/DailyWeather.kt | 3 +- .../h_mal/atlas_weather/model/weather/Hour.kt | 48 +++-- .../h_mal/atlas_weather}/ui/BaseFragment.kt | 64 ++++--- .../h_mal/atlas_weather}/ui/MainActivity.kt | 15 +- .../h_mal/atlas_weather/utils/StringUtils.kt | 4 +- .../h_mal/atlas_weather/utils/ViewUtils.kt | 17 +- .../viewmodel/ApplicationViewModelFactory.kt | 5 +- .../atlas_weather/viewmodel/MainViewModel.kt | 4 +- .../atlas_weather/viewmodel/WorldViewModel.kt | 4 +- .../widget/BaseWidgetServiceIntentClass.kt | 2 +- .../atlas_weather}/widget/NewAppWidget.kt | 5 +- .../widget/WidgetJobServiceIntent.kt | 16 +- .../atlas_weather}/widget/WidgetState.kt | 2 +- .../main/res/layout/activity_add_forecast.xml | 2 +- .../res/layout/activity_main_navigation.xml | 2 +- app/src/main/res/layout/fragment__two.xml | 2 +- .../main/res/layout/fragment_add_location.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 4 +- app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/values/styles.xml | 8 + .../main/res/xml/network_security_config.xml | 6 + app/src/monoWeather/AndroidManifest.xml | 14 +- .../ui/settings/UnitSettingsActivity.kt | 53 ------ .../appttude/h_mal/atlas_weather/ui/Tabs.kt | 5 + .../monoWeather/dialog/DeclarationBuilder.kt | 22 +++ .../dialog/PermissionsDeclarationDialog.kt | 45 +++++ .../monoWeather/ui/EmptyViewHolder.kt | 2 +- .../monoWeather/ui/WorldItemFragment.kt | 6 +- .../ui/details/FurtherInfoFragment.kt | 2 +- .../monoWeather/ui/home/HomeFragment.kt | 30 ++-- .../ui/home/adapter/ViewHolderCurrent.kt | 4 +- .../ui/home/adapter/WeatherRecyclerAdapter.kt | 10 +- .../home/adapter/forecast/GridCellHolder.kt | 2 +- .../adapter/forecast/GridForecastAdapter.kt | 2 +- .../adapter/forecast/ViewHolderForecast.kt | 2 +- .../forecastDaily/ViewHolderForecastDaily.kt | 2 +- .../ui/home/adapter/further/GridAdapter.kt | 2 +- .../further/ViewHolderFurtherDetails.kt | 2 +- .../ui/settings/SettingsFragment.kt | 41 +++++ .../WidgetLocationPermissionActivity.kt | 4 +- .../ui/world/AddLocationFragment.kt | 6 +- .../monoWeather/ui/world/WorldFragment.kt | 8 +- .../ui/world/WorldRecyclerAdapter.kt | 8 +- .../res/navigation/main_navigation.xml | 41 ++--- app/src/monoWeather/res/values/arrays.xml | 12 ++ app/src/monoWeather/res/values/strings.xml | 14 ++ app/src/monoWeather/res/values/styles.xml | 8 - .../res/xml/new_app_widget_info.xml | 15 ++ .../monoWeather/res/xml/root_preferences.xml | 35 ++++ fastlane/Fastfile | 45 +++++ gradle.properties | 2 +- settings.gradle | 2 +- 121 files changed, 1326 insertions(+), 1586 deletions(-) create mode 100644 .idea/androidTestResultsUserPreferences.xml create mode 100644 .idea/kotlinc.xml create mode 100644 Gemfile create mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/BaseTest.kt rename app/src/androidTest/java/com/appttude/h_mal/atlas_weather/{utils => }/BaseTestRobot.kt (90%) delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/BaseUiTest.kt delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/Constants.kt rename app/src/androidTest/java/com/appttude/h_mal/atlas_weather/{ => helpers}/CustomViewMatchers.kt (96%) delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/DataHelper.kt rename app/src/androidTest/java/com/appttude/h_mal/atlas_weather/{data/location => instrumentationTests}/LocationProviderImplTest.kt (94%) delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/monoWeather/testsuite/BaseTest.kt delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/monoWeather/testsuite/HomePageUITestScenario.kt delete mode 100644 app/src/androidTest/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/widget/WidgetLocationPermissionActivityTest.kt delete mode 100644 app/src/androidTestMonoWeather/java/com/appttude/h_mal/atlas_weather/tests/HomePageUITest.kt create mode 100644 app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/MonoBaseTest.kt rename app/src/androidTestMonoWeather/java/com/appttude/h_mal/{atlas_weather => monoWeather}/robot/HomeScreenRobot.kt (79%) create mode 100644 app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/robot/WidgetPermissionScreenRobot.kt create mode 100644 app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/tests/HomePageUITest.kt create mode 100644 app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/tests/WidgetLocationPermissionActivityTest.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/ui/BaseFragment.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/ui/MainActivity.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/ui/home/HomeFragment.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/ui/settings/UnitSettingsActivity.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/widget/BaseWidgetClass.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/widget/MyWidgetRemoteViewsFactory.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/widget/NewAppWidget.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/widget/WidgetRemoteViewsService.kt delete mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather/widget/WidgetUtils.kt rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/notification/NotificationData.kt (62%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/notification/NotificationReceiver.kt (91%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/BaseActivity.kt (63%) create mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/Tabs.kt rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/WorldItemFragment.kt (91%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/details/FurtherInfoFragment.kt (95%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => atlasWeather/java/com/appttude/h_mal/atlas_weather/ui}/dialog/DeclarationBuilder.kt (86%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => atlasWeather/java/com/appttude/h_mal/atlas_weather/ui}/dialog/PermissionsDeclarationDialog.kt (91%) create mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/HomeFragment.kt rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/home/adapter/EmptyViewHolder.kt (64%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => atlasWeather/java/com/appttude/h_mal/atlas_weather}/ui/home/adapter/ViewHolderCurrent.kt (93%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/home/adapter/ViewHolderForecast.kt (93%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/home/adapter/ViewHolderFurtherDetails.kt (92%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/home/adapter/WeatherRecyclerAdapter.kt (97%) create mode 100644 app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/settings/SettingsFragment.kt rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/world/AddLocationFragment.kt (70%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/world/WorldFragment.kt (69%) rename app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/{atlasWeather => }/ui/world/WorldRecyclerAdapter.kt (98%) create mode 100644 app/src/atlasWeather/res/drawable/gradient.xml create mode 100644 app/src/atlasWeather/res/font/archeologicaps.ttf create mode 100644 app/src/atlasWeather/res/values/colors.xml rename app/src/{main => atlasWeather}/res/xml/new_app_widget_info.xml (80%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/ui/BaseFragment.kt (74%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/ui/MainActivity.kt (76%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/widget/BaseWidgetServiceIntentClass.kt (97%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/widget/NewAppWidget.kt (80%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/widget/WidgetJobServiceIntent.kt (94%) rename app/src/{monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather => main/java/com/appttude/h_mal/atlas_weather}/widget/WidgetState.kt (93%) create mode 100644 app/src/main/res/xml/network_security_config.xml delete mode 100644 app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/settings/UnitSettingsActivity.kt create mode 100644 app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/ui/Tabs.kt create mode 100644 app/src/monoWeather/java/com/appttude/h_mal/monoWeather/dialog/DeclarationBuilder.kt create mode 100644 app/src/monoWeather/java/com/appttude/h_mal/monoWeather/dialog/PermissionsDeclarationDialog.kt rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/EmptyViewHolder.kt (92%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/WorldItemFragment.kt (90%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/details/FurtherInfoFragment.kt (96%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/HomeFragment.kt (73%) rename app/src/{atlasWeather/java/com/appttude/h_mal/atlas_weather/atlasWeather => monoWeather/java/com/appttude/h_mal/monoWeather}/ui/home/adapter/ViewHolderCurrent.kt (89%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/WeatherRecyclerAdapter.kt (89%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/forecast/GridCellHolder.kt (91%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/forecast/GridForecastAdapter.kt (92%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/forecast/ViewHolderForecast.kt (86%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/forecastDaily/ViewHolderForecastDaily.kt (92%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/further/GridAdapter.kt (91%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/home/adapter/further/ViewHolderFurtherDetails.kt (90%) create mode 100644 app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/settings/SettingsFragment.kt rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/widget/WidgetLocationPermissionActivity.kt (96%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/world/AddLocationFragment.kt (88%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/world/WorldFragment.kt (87%) rename app/src/monoWeather/java/com/appttude/h_mal/{atlas_weather => }/monoWeather/ui/world/WorldRecyclerAdapter.kt (96%) create mode 100644 app/src/monoWeather/res/values/arrays.xml create mode 100644 app/src/monoWeather/res/xml/new_app_widget_info.xml create mode 100644 app/src/monoWeather/res/xml/root_preferences.xml create mode 100644 fastlane/Fastfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e85eac..d69dd23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,18 +14,17 @@ commands: description: checkout repo and android dependencies steps: - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Chmod permissions - command: sudo chmod +x ./gradlew + - android/restore-gradle-cache + build_gradle: + description: Build the gradle + steps: + - android/restore-gradle-cache - run: name: Download Dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} + command: | + sudo chmod +x ./gradlew + ./gradlew androidDependencies + - android/save-gradle-cache run_tests: description: run tests for flavour specified parameters: @@ -33,14 +32,17 @@ commands: type: string default: "AtlasWeather" steps: - # The next step will run the unit tests - - android/run-tests: - test-command: ./gradlew test<< parameters.flavour >>DebugUnitTest --continue - - store_artifacts: - path: app/build/reports - destination: reports - - store_test_results: - path: app/build/test-results + # The next step will run the unit tests + - build_gradle + - run: + name: Run non-instrumentation unit tests + command: | + ./gradlew test<< parameters.flavour >>DebugUnitTest --continue + - store_artifacts: + path: app/build/reports + destination: reports + - store_test_results: + path: app/build/test-results run_ui_tests: description: run tests for flavour specified parameters: @@ -48,27 +50,47 @@ commands: type: string default: "AtlasWeather" steps: - - android/start-emulator-and-run-tests: - post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest - test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest - system-image: system-images;android-25;google_apis;x86 - max-tries: 1 - kill-emulators: false - - run: - name: Pull screenshots from device - command: | - mkdir ~/screenshots - adb pull /storage/emulated/0/Android/data/com.appttude.h_mal.atlas_weather/files/screengrab/en-US/images/screenshots ~/screenshots - when: on_fail - # store test reports - - store_artifacts: - path: app/build/reports/androidTests/connected - destination: reports - # store screenshots for failed ui tests - - store_artifacts: - path: ~/screenshots - destination: screenshots - + - build_gradle + - android/start-emulator-and-run-tests: + post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest + test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest + system-image: system-images;android-26;google_apis;x86 + pull-data: true + pull-data-path: /storage/emulated/0/Android/data/ + pull-data-target: ~/app-data + restore-gradle-cache-prefix: v1a + # store test reports + - store_artifacts: + path: app/build/reports/androidTests/connected + destination: reports + # store screenshots for failed ui tests + - store_artifacts: + path: ~/app-data + destination: screenshots + - store_test_results: + path: app/build/outputs/androidTest-results/connected + deploy_to_play_store: + description: deploy to playstore based on flavour + parameters: + flavour: + type: string + default: "AtlasWeather" + steps: + # The next step will run the unit tests + - android/decode-keystore: + keystore-location: "./app/keystore.jks" + - run: + name: Setup playstore key + command: | + echo "$GOOGLE_PLAY_KEY" > "google-play-key.json" + - build_gradle + - run: + name: Run fastlane command to deploy to playstore + command: | + pwd + bundle exec fastlane deploy<< parameters.flavour >> + - store_test_results: + path: fastlane/report.xml # Define a job to be invoked later in a workflow. # See: https://circleci.com/docs/2.0/configuration-reference/#jobs jobs: @@ -90,54 +112,60 @@ jobs: - setup_repo - run_tests: flavour: << parameters.flavour >> - ui-test-and-release: - # Parameters used for determining + - run_ui_tests: + flavour: << parameters.flavour >> + deploy-to-playstore: parameters: flavour: type: string - default: "AtlasWeather" - executor: - name: android/android-machine - tag: 2023.05.1 + default: "Driver" + docker: + - image: cimg/android:2023.07-browsers + auth: + username: ${DOCKER_USERNAME} + password: ${DOCKER_PASSWORD} steps: - setup_repo - - run_ui_tests - - run: - name: Setup variables for release - command: | - echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "android/app/release_keystore.jks" - echo "$GOOGLE_PLAY_KEY" > "android/playstore.json" - # And finally run the release build - - run: - name: Assemble and Upload to PlayStore - command: | - pwd - bundle exec fastlane deploy<< parameters.flavour >> + - deploy_to_play_store: + flavour: << parameters.flavour >> # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: version: 2 + build-release-mono: + jobs: + - build-and-test: + context: appttude + flavour: "MonoWeather" + filters: + branches: + ignore: + - main_atlas + - deploy-to-playstore: + context: appttude + flavour: "MonoWeather" + filters: + branches: + only: + - main_mono + requires: + - build-and-test build-release-atlas: jobs: - build-and-test: + context: appttude flavour: "AtlasWeather" - - ui-test-and-release: + filters: + branches: + ignore: + - main_mono + - deploy-to-playstore: + context: appttude flavour: "AtlasWeather" filters: branches: only: - main_atlas - requires: - - build-and-test - build-release-mono: - jobs: - - build-and-test: - flavour: "MonoWeather" - - ui-test-and-release: - flavour: "MonoWeather" - filters: - branches: - only: main_admin requires: - build-and-test \ No newline at end of file diff --git a/.gitignore b/.gitignore index e96e488..0ea4711 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,11 @@ gen-external-apklibs .idea/assetWizardSettings.xml .idea/gradle.xml .idea/jarRepositorie + +# Gem/fastlane +/Gemfile.lock +/fastlane/report.xml +# Google play files +/google-play-key.json + +/.idea/androidTestResultsUserPreferences.xml diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..b3dab32 --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,113 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index db291c6..7643783 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,24 +1,13 @@ - - + +