diff --git a/.gradle/5.5/executionHistory/executionHistory.bin b/.gradle/5.5/executionHistory/executionHistory.bin index 29ab384..1dc4daf 100644 Binary files a/.gradle/5.5/executionHistory/executionHistory.bin and b/.gradle/5.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/5.5/executionHistory/executionHistory.lock b/.gradle/5.5/executionHistory/executionHistory.lock index c378574..6c1e077 100644 Binary files a/.gradle/5.5/executionHistory/executionHistory.lock and b/.gradle/5.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/5.5/fileHashes/fileHashes.bin b/.gradle/5.5/fileHashes/fileHashes.bin index 75b19c6..29d9bd7 100644 Binary files a/.gradle/5.5/fileHashes/fileHashes.bin and b/.gradle/5.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.5/fileHashes/fileHashes.lock b/.gradle/5.5/fileHashes/fileHashes.lock index 7520aff..c4b9b25 100644 Binary files a/.gradle/5.5/fileHashes/fileHashes.lock and b/.gradle/5.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.5/fileHashes/resourceHashesCache.bin b/.gradle/5.5/fileHashes/resourceHashesCache.bin index f6f5957..ac73b70 100644 Binary files a/.gradle/5.5/fileHashes/resourceHashesCache.bin and b/.gradle/5.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/5.5/javaCompile/classAnalysis.bin b/.gradle/5.5/javaCompile/classAnalysis.bin index 2cd75ac..e41f0a3 100644 Binary files a/.gradle/5.5/javaCompile/classAnalysis.bin and b/.gradle/5.5/javaCompile/classAnalysis.bin differ diff --git a/.gradle/5.5/javaCompile/jarAnalysis.bin b/.gradle/5.5/javaCompile/jarAnalysis.bin index 4c3b9a4..138e9c4 100644 Binary files a/.gradle/5.5/javaCompile/jarAnalysis.bin and b/.gradle/5.5/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/5.5/javaCompile/javaCompile.lock b/.gradle/5.5/javaCompile/javaCompile.lock index d10aa87..a9e8974 100644 Binary files a/.gradle/5.5/javaCompile/javaCompile.lock and b/.gradle/5.5/javaCompile/javaCompile.lock differ diff --git a/.gradle/5.5/javaCompile/taskHistory.bin b/.gradle/5.5/javaCompile/taskHistory.bin index 6be3289..263ced2 100644 Binary files a/.gradle/5.5/javaCompile/taskHistory.bin and b/.gradle/5.5/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 79fcaf1..21bf31a 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 6c4d1d7..7dc2875 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml index f0d36a6..9e1d21c 100644 --- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml index c6e8732..fe37416 100644 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml index 04422c7..3356646 100644 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml index c4be2b7..febc757 100644 --- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml index e3c91bf..03a3753 100644 --- a/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml index 79f37e1..b172700 100644 --- a/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml index f420d86..12dd8a6 100644 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml index 6f81afa..34163e8 100644 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml index 47f2a9d..0204b73 100644 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml index 76cd8bf..d45fbed 100644 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml index 9a01182..898527c 100644 --- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml index 54903d6..72ee31d 100644 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml index 8269fd4..b07cdbe 100644 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml index 7cb12c4..a033c15 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml index 43786ca..348eeae 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml index b8234e3..e9cf635 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml index 4fd2b7e..37fefaf 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml index 45ddbba..e31d412 100644 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml index a30a9a1..12a8b26 100644 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml index 9c7dd24..870ee95 100644 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml index 4ae3c63..8cc50c2 100644 --- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml index 3f8d48a..62326ba 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml index 2b8dedf..a8c494f 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml index 9680c0c..b2f4889 100644 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml index b94ae9c..dafa156 100644 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_17_0_0_aar.xml index 91a35a3..724d9b0 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_0_0_aar.xml index 808232d..0344940 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml index 3293903..b78b2e8 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_17_2_1_aar.xml index 696bc0a..bc0f06a 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_17_2_1_aar.xml index f85ca0e..710c717 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_17_2_1_aar.xml index 8ec1220..1e4896f 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_17_2_1_aar.xml index 43f9bb9..8b16893 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_17_2_1_aar.xml index d3fd13f..2cd2389 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_17_2_1_aar.xml index f5aba9c..9181d83 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_17_0_0_aar.xml index 0fd135e..29be248 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml index b775cb7..ea2a070 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_17_2_1_aar.xml index 6f5afb2..207ebff 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_3_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_3_0_aar.xml index de20b29..42246fa 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_3_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_3_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_0_0_aar.xml index c759119..c0d2c73 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_core_17_2_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_core_17_2_1_aar.xml index 31921c2..3889a6d 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_core_17_2_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_core_17_2_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_20_0_2_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_20_0_2_aar.xml index 4c36e25..2e30003 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_20_0_2_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_20_0_2_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_17_0_0_aar.xml index 907bb59..db51b73 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_18_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_18_0_0_aar.xml index 82fe443..38fe016 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_18_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_18_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_20_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_20_0_1_aar.xml index f4f7c89..262d223 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_20_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_20_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 2d15016..4cc3f5b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/GMS-Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml b/GMS-Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml new file mode 100644 index 0000000..0bfedd9 --- /dev/null +++ b/GMS-Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml b/Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml new file mode 100644 index 0000000..5238dd4 --- /dev/null +++ b/Hyber-SVC-SDK-Android-Hyber-SDK-Android.iml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5d02683..742500e 100755 --- a/build.gradle +++ b/build.gradle @@ -5,14 +5,13 @@ buildscript { repositories { google() jcenter() - } + dependencies { classpath 'com.android.tools.build:gradle:3.6.0-alpha10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.3' + //classpath 'com.google.gms:google-services:3.1.1' classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -24,7 +23,7 @@ allprojects { jcenter() maven { url 'https://jitpack.io' -// credentials { username authToken } + // credentials { username authToken } } } } diff --git a/gradle.properties b/gradle.properties index 4d05504..fe0e4fd 100755 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,4 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official authToken=jp_su5amhfnpcr95k8lu2nj9tu9ou +android.enableAapt2=false diff --git a/hybersdkandroid/build.gradle b/hybersdkandroid/build.gradle index 24b9a6c..55169b1 100755 --- a/hybersdkandroid/build.gradle +++ b/hybersdkandroid/build.gradle @@ -37,17 +37,17 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.core:core-ktx:1.1.0' testImplementation 'junit:junit:4.12' - // androidTestImplementation 'androidx.test.ext:junit:1.1.1' - // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + // androidTestImplementation 'androidx.test.ext:junit:1.1.1' + // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - // implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - // implementation 'androidx.appcompat:appcompat:1.1.0' - // implementation 'androidx.core:core-ktx:1.1.0' - // testImplementation 'junit:junit:4.12' - // androidTestImplementation 'androidx.test.ext:junit:1.1.1' - // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + // implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + // implementation 'androidx.appcompat:appcompat:1.1.0' + // implementation 'androidx.core:core-ktx:1.1.0' + // testImplementation 'junit:junit:4.12' + // androidTestImplementation 'androidx.test.ext:junit:1.1.1' + // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.9.1" - // implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + // implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'com.google.firebase:firebase-core:17.2.1' implementation 'com.google.firebase:firebase-iid:20.0.2' @@ -55,10 +55,10 @@ dependencies { //implementation 'android.arch.work:work-runtime:1.0.1' // Testing dependencies - // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - // androidTestImplementation 'androidx.test:runner:1.2.0' - // androidTestImplementation 'androidx.test:rules:1.2.0' - // androidTestImplementation 'androidx.annotation:annotation:1.0.0' - // implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50" + // androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + // androidTestImplementation 'androidx.test:runner:1.2.0' + // androidTestImplementation 'androidx.test:rules:1.2.0' + // androidTestImplementation 'androidx.annotation:annotation:1.0.0' + // implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50" } diff --git a/hybersdkandroid/hybersdkandroid.iml b/hybersdkandroid/hybersdkandroid.iml index 8b8f76e..84c5a64 100755 --- a/hybersdkandroid/hybersdkandroid.iml +++ b/hybersdkandroid/hybersdkandroid.iml @@ -32,7 +32,7 @@