-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update Bouncer SDK (#132) * Release scan lib v1.0.3 (#135) * Firebase Test Lab Integration (#84) * Update HTTPMethod.kt (#133) * Fix custom fonts (#136) * Implement ability to add collect data in collections (#138) * Add FlatMap implementation * Add deepMerge logic implementation * Refactor * Add map tests * Add array list tests * Update VGSRequest.kt, add VGSCollectFieldNameMappingPolicy.kt, update tests, improve deep merge logic * Fix tests * Implement new logic * Fix tests * Improve array deepMerge logic * Update comments * Update comments * Add analytics * Update visibility modifier * Update release script (Maven) (#140) * Update cardio distribution flow (switch to maven) * Revert "Update cardio distribution flow (switch to maven)" This reverts commit e94700e * Revert "Update cardio distribution flow (switch to maven)" Update release script, add possibility to release on maven * Version name & code rise * Update docs * Fix UI tests * Fix UI tests * Fix UI tests * Remove incorrect step * Add start screen wait * Update docs * Update device list * Remove broken device Co-authored-by: Dmytro Kos <dmitriy.kosolapenko@vgs.io>
- Loading branch information
Showing
201 changed files
with
2,738 additions
and
1,951 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,78 @@ | ||
| version: 2.1 | ||
| aliases: | ||
| - &restore_gem_cache | ||
| name: Restore cache | ||
| keys: | ||
| - jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} | ||
|
|
||
| - &save_gem_cache | ||
| name: Saving cache | ||
| key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} | ||
| paths: | ||
| - ~/.gradle | ||
|
|
||
| - &attach_workspace | ||
| attach_workspace: | ||
| at: ~/code | ||
|
|
||
| - &download_dep | ||
| - checkout | ||
| - *attach_workspace | ||
| - run: | ||
| name: Download Dependencies | ||
| command: | | ||
| sudo chmod +x gradlew | ||
| ./gradlew androidDependencies | ||
| - &run_lint | ||
| - checkout | ||
| - *attach_workspace | ||
| - restore_cache: *restore_gem_cache | ||
| - run: | ||
| name: Run Lint | ||
| command: ./gradlew lintDebug | ||
| - save_cache: *save_gem_cache | ||
|
|
||
| - &run_unit_tests | ||
| - checkout | ||
| - *attach_workspace | ||
| - run: | ||
| name: Run Unit Tests | ||
| command: ./gradlew testDebugUnitTest | ||
|
|
||
|
|
||
|
|
||
| - &assembleDebug | ||
| - checkout | ||
| - *attach_workspace | ||
| - run: | ||
| name: Build Debug | ||
| command: ./gradlew assembleDebug | ||
| - store_artifacts: | ||
| path: app/build/outputs/apk/debug/app-debug.apk | ||
| destination: app-debug.apk | ||
|
|
||
|
|
||
|
|
||
| - &deploy_environment | ||
| working_directory: ~/code | ||
| docker: | ||
| - image: circleci/android:api-29 | ||
| - &test_environment | ||
| aliases: | ||
| - &environment | ||
| working_directory: ~/code | ||
| docker: | ||
| - image: circleci/android:api-29 | ||
|
|
||
|
|
||
| # dependency groups | ||
| - &prepare_sources | ||
| - "Prepared_Sources" | ||
|
|
||
| - &all_test | ||
| - "Run_Lint" | ||
| - "Run_Unit_Tests" | ||
|
|
||
| - &debug_build | ||
| - "Assemble_Debug_Build" | ||
|
|
||
| jobs: | ||
| "Prepared_Sources": | ||
| <<: *test_environment | ||
| environment: | ||
| JVM_OPTS: -Xmx3200m | ||
| steps: *download_dep | ||
|
|
||
| "Run_Lint": | ||
| <<: *test_environment | ||
| environment: | ||
| JVM_OPTS: -Xmx3200m | ||
| steps: *run_lint | ||
|
|
||
| "Run_Unit_Tests": | ||
| <<: *test_environment | ||
| environment: | ||
| JVM_OPTS: -Xmx3200m | ||
| steps: *run_unit_tests | ||
|
|
||
| "Assemble_Debug_Build": | ||
| <<: *test_environment | ||
| environment: | ||
| JVM_OPTS: -Xmx3200m | ||
| steps: *assembleDebug | ||
|
|
||
|
|
||
| jobs: | ||
| "Run_Unit_Test_And_Build": | ||
| <<: *environment | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
| key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} | ||
| - run: | ||
| name: Download Dependencies | ||
| command: | | ||
| sudo chmod +x gradlew | ||
| ./gradlew androidDependencies | ||
| - save_cache: | ||
| paths: | ||
| - ~/.gradle | ||
| key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} | ||
| - run: | ||
| name: Run Lint | ||
| command: ./gradlew lintDebug | ||
| - run: | ||
| name: Run Unit tests | ||
| command: ./gradlew testDebugUnitTest | ||
| - run: | ||
| name: Generate apk | ||
| command: ./gradlew assembleDebug assembleAndroidTest | ||
| - persist_to_workspace: | ||
| root: ~/code | ||
| paths: | ||
| - app | ||
| "Run_UI_Test": | ||
| <<: *environment | ||
| steps: | ||
| - attach_workspace: | ||
| at: ~/code | ||
| - run: | ||
| name: Check if release branch | ||
| command: | | ||
| if [[ $CIRCLE_BRANCH != *"release/"* ]] && [ $CIRCLE_BRANCH != master* ]; then | ||
| echo "Skipped, reason: UI tests should be running only on release branches or master!" | ||
| circleci-agent step halt | ||
| fi | ||
| - run: | ||
| name: Store Google Service Account | ||
| command: echo $GCLOUD_SERVICE_KEY | base64 -di > ${HOME}/gcloud-service-key.json | ||
| - run: | ||
| name: Authorize gcloud and set config defaults | ||
| command: | | ||
| sudo gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json | ||
| sudo gcloud --quiet config set project ${GOOGLE_PROJECT_ID} | ||
| - run: | ||
| name: Test with Firebase Test Lab | ||
| command: > | ||
| sudo gcloud firebase test android run \ | ||
| --app app/build/outputs/apk/debug/app-debug.apk \ | ||
| --test app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \ | ||
| --device model=lv0,version=23,locale=en,orientation=portrait \ | ||
| --device model=capricorn,version=26,locale=en,orientation=portrait \ | ||
| --device model=tissot_sprout,version=28,locale=en,orientation=portrait \ | ||
| --device model=x1q,version=29,locale=en,orientation=portrait \ | ||
| --device model=flame,version=30,locale=en,orientation=portrait \ | ||
| workflows: | ||
| version: 2.1 | ||
| main: | ||
| jobs: | ||
| - "Prepared_Sources" | ||
| - "Run_Lint": | ||
| requires: | ||
| *prepare_sources | ||
| - "Run_Unit_Tests": | ||
| requires: | ||
| *prepare_sources | ||
| - "Assemble_Debug_Build": | ||
| - "Run_Unit_Test_And_Build" | ||
| - "Run_UI_Test": | ||
| requires: | ||
| *all_test | ||
| - "Run_Unit_Test_And_Build" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| { | ||
| "project_info": { | ||
| "project_number": "562744519177", | ||
| "project_id": "vgs-collect-show-mobile", | ||
| "storage_bucket": "vgs-collect-show-mobile.appspot.com" | ||
| }, | ||
| "client": [ | ||
| { | ||
| "client_info": { | ||
| "mobilesdk_app_id": "1:562744519177:android:f50d3502b71e788998e6d8", | ||
| "android_client_info": { | ||
| "package_name": "com.verygoodsecurity.demoapp" | ||
| } | ||
| }, | ||
| "oauth_client": [ | ||
| { | ||
| "client_id": "562744519177-nkkq796tgp357quqmi6cut67c3dn1s15.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ], | ||
| "api_key": [ | ||
| { | ||
| "current_key": "AIzaSyDKfiuIW17Ojt6iX0FfOfElOV7p31rbYQY" | ||
| } | ||
| ], | ||
| "services": { | ||
| "appinvite_service": { | ||
| "other_platform_oauth_client": [ | ||
| { | ||
| "client_id": "562744519177-nkkq796tgp357quqmi6cut67c3dn1s15.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "client_info": { | ||
| "mobilesdk_app_id": "1:562744519177:android:6f3805cf56e8606498e6d8", | ||
| "android_client_info": { | ||
| "package_name": "com.verygoodsecurity.demoshow" | ||
| } | ||
| }, | ||
| "oauth_client": [ | ||
| { | ||
| "client_id": "562744519177-nkkq796tgp357quqmi6cut67c3dn1s15.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ], | ||
| "api_key": [ | ||
| { | ||
| "current_key": "AIzaSyDKfiuIW17Ojt6iX0FfOfElOV7p31rbYQY" | ||
| } | ||
| ], | ||
| "services": { | ||
| "appinvite_service": { | ||
| "other_platform_oauth_client": [ | ||
| { | ||
| "client_id": "562744519177-nkkq796tgp357quqmi6cut67c3dn1s15.apps.googleusercontent.com", | ||
| "client_type": 3 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "configuration_version": "1" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/src/androidTest/java/com/verygoodsecurity/demoapp/Utils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.verygoodsecurity.demoapp | ||
|
|
||
| object Utils { | ||
|
|
||
| const val DEFAULT_TENANT_ID = "tntpszqgikn" | ||
| const val DEFAULT_PATH = "/post" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.