From 6f0450fe9ecceac10b4f573c67c2b22c38808d47 Mon Sep 17 00:00:00 2001 From: Pawlo Date: Fri, 18 Oct 2019 14:11:12 +0300 Subject: [PATCH] fix after merge --- .idea/caches/build_file_checksums.ser | Bin 643 -> 593 bytes .idea/gradle.xml | 1 - ...x_annotation_annotation_1_0_0_rc01_jar.xml | 11 - ...idx_appcompat_appcompat_1_0_0_rc01_aar.xml | 15 -- ...x_arch_core_core_common_2_0_0_rc01_jar.xml | 11 - ..._arch_core_core_runtime_2_0_0_rc01_aar.xml | 12 -- ...ter_asynclayoutinflater_1_0_0_rc01_aar.xml | 12 -- ...x_collection_collection_1_0_0_rc01_jar.xml | 11 - ...ayout_coordinatorlayout_1_0_0_rc01_aar.xml | 15 -- ...dle__androidx_core_core_1_0_0_rc01_aar.xml | 15 -- ...oradapter_cursoradapter_1_0_0_rc01_aar.xml | 12 -- ...x_customview_customview_1_0_0_rc01_aar.xml | 12 -- ...cumentfile_documentfile_1_0_0_rc01_aar.xml | 12 -- ...awerlayout_drawerlayout_1_0_0_rc01_aar.xml | 15 -- ...roidx_fragment_fragment_1_0_0_rc01_aar.xml | 15 -- ...terpolator_interpolator_1_0_0_rc01_aar.xml | 12 -- ..._legacy_support_core_ui_1_0_0_rc01_aar.xml | 12 -- ...gacy_support_core_utils_1_0_0_rc01_aar.xml | 12 -- ...ecycle_lifecycle_common_2_0_0_rc01_jar.xml | 11 - ...lifecycle_livedata_core_2_0_0_rc01_aar.xml | 12 -- ...cycle_lifecycle_runtime_2_0_0_rc01_aar.xml | 12 -- ...cle_lifecycle_viewmodel_2_0_0_rc01_aar.xml | 12 -- ..._androidx_loader_loader_1_0_0_rc01_aar.xml | 12 -- ...r_localbroadcastmanager_1_0_0_rc01_aar.xml | 12 -- ...e__androidx_print_print_1_0_0_rc01_aar.xml | 15 -- ...ayout_slidingpanelayout_1_0_0_rc01_aar.xml | 12 -- ...yout_swiperefreshlayout_1_0_0_rc01_aar.xml | 15 -- ...drawable_vectordrawable_1_0_0_rc01_aar.xml | 12 -- ...vectordrawable_animated_1_0_0_rc01_aar.xml | 12 -- ...ble_versionedparcelable_1_0_0_rc01_aar.xml | 12 -- ...idx_viewpager_viewpager_1_0_0_rc01_aar.xml | 12 -- ...radle__com_google_auto_auto_common_0_8.xml | 11 + ...ogle_auto_service_auto_service_1_0_rc4.xml | 11 + ..._com_google_code_findbugs_jsr305_1_3_9.xml | 9 + ...e__com_google_code_gson_gson_2_8_2_jar.xml | 11 - ...orprone_error_prone_annotations_2_0_18.xml | 11 + ...radle__com_google_guava_guava_23_5_jre.xml | 11 + ...m_google_j2objc_j2objc_annotations_1_1.xml | 11 + ...t2_kotlin_coroutines_adapter_0_9_2_jar.xml | 11 - .../Gradle__com_squareup_kotlinpoet_1_0_1.xml | 11 + ...okhttp3_logging_interceptor_3_10_0_jar.xml | 11 - ...com_squareup_okhttp3_okhttp_3_10_0_jar.xml | 11 - ...dle__com_squareup_okio_okio_1_14_0_jar.xml | 11 - ...up_retrofit2_adapter_rxjava2_2_4_0_jar.xml | 11 - ...eup_retrofit2_converter_gson_2_4_0_jar.xml | 11 - ..._retrofit2_converter_scalars_2_4_0_jar.xml | 11 - ..._squareup_retrofit2_retrofit_2_4_0_jar.xml | 11 - ..._io_reactivex_rxjava2_rxjava_2_0_0_jar.xml | 11 - ...rg_checkerframework_checker_qual_2_0_0.xml | 11 + ...s_mojo_animal_sniffer_annotations_1_14.xml | 11 + ...radle__org_jetbrains_annotations_13_0.xml} | 2 +- ..._android_extensions_runtime_1_3_31_jar.xml | 11 - ...jetbrains_kotlin_kotlin_reflect_1_3_11.xml | 11 + ...jetbrains_kotlin_kotlin_stdlib_1_3_31.xml} | 2 +- ...ns_kotlin_kotlin_stdlib_common_1_3_31.xml} | 2 +- ...ains_kotlin_kotlin_stdlib_jdk7_1_3_31.xml} | 2 +- ...rains_kotlin_kotlin_stdlib_jdk8_1_3_31.xml | 11 + ...tlinx_atomicfu_common_0_11_7_eap13_jar.xml | 11 - ...tlinx_coroutines_core_0_26_1_eap13_jar.xml | 11 - ...oroutines_core_common_0_26_1_eap13_jar.xml | 11 - ...ein_di_kodein_di_core_common_5_1_1_jar.xml | 11 - ...kodein_di_kodein_di_core_jvm_5_1_1_jar.xml | 11 - ..._kodein_di_framework_android_5_1_1_aar.xml | 12 -- ...ein_di_kodein_di_generic_jvm_5_1_1_jar.xml | 11 - ...tivestreams_reactive_streams_1_0_0_jar.xml | 11 - .idea/modules.xml | 1 - .idea/modules/processor/processor.iml | 31 ++- annotations/annotations.iml | 18 +- core.iml | 6 +- retrofit/.gitignore | 1 - retrofit/build.gradle | 52 ----- retrofit/proguard-rules.pro | 21 -- retrofit/retrofit.iml | 204 ------------------ retrofit/src/main/AndroidManifest.xml | 2 - .../com/vrgsoft/retrofit/RetrofitModule.kt | 60 ------ .../java/com/vrgsoft/retrofit/common/Auth.kt | 8 - .../retrofit/common/AuthCustomInterceptor.kt | 31 --- .../retrofit/common/AuthInterceptor.kt | 14 -- .../retrofit/common/HeaderInterceptor.kt | 12 -- .../vrgsoft/retrofit/common/RetrofitConfig.kt | 6 - retrofit/src/main/res/values/strings.xml | 3 - .../com/vrgsoft/retrofit/ExampleUnitTest.java | 17 -- settings.gradle | 1 - 83 files changed, 173 insertions(+), 1018 deletions(-) delete mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml create mode 100644 .idea/libraries/Gradle__com_google_auto_auto_common_0_8.xml create mode 100644 .idea/libraries/Gradle__com_google_auto_service_auto_service_1_0_rc4.xml create mode 100644 .idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml delete mode 100644 .idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml create mode 100644 .idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml create mode 100644 .idea/libraries/Gradle__com_google_guava_guava_23_5_jre.xml create mode 100644 .idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml delete mode 100644 .idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_kotlin_coroutines_adapter_0_9_2_jar.xml create mode 100644 .idea/libraries/Gradle__com_squareup_kotlinpoet_1_0_1.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_4_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_4_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml delete mode 100644 .idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__org_checkerframework_checker_qual_2_0_0.xml create mode 100644 .idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml rename .idea/libraries/{Gradle__org_jetbrains_annotations_13_0_jar.xml => Gradle__org_jetbrains_annotations_13_0.xml} (88%) delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_31_jar.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31_jar.xml => Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml} (98%) rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31_jar.xml => Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml} (94%) rename .idea/libraries/{Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31_jar.xml => Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31.xml} (97%) create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_3_31.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_atomicfu_common_0_11_7_eap13_jar.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13_jar.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_0_26_1_eap13_jar.xml delete mode 100644 .idea/libraries/Gradle__org_kodein_di_kodein_di_core_common_5_1_1_jar.xml delete mode 100644 .idea/libraries/Gradle__org_kodein_di_kodein_di_core_jvm_5_1_1_jar.xml delete mode 100644 .idea/libraries/Gradle__org_kodein_di_kodein_di_framework_android_5_1_1_aar.xml delete mode 100644 .idea/libraries/Gradle__org_kodein_di_kodein_di_generic_jvm_5_1_1_jar.xml delete mode 100644 .idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml delete mode 100644 retrofit/.gitignore delete mode 100644 retrofit/build.gradle delete mode 100644 retrofit/proguard-rules.pro delete mode 100644 retrofit/retrofit.iml delete mode 100644 retrofit/src/main/AndroidManifest.xml delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/RetrofitModule.kt delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt delete mode 100644 retrofit/src/main/java/com/vrgsoft/retrofit/common/RetrofitConfig.kt delete mode 100644 retrofit/src/main/res/values/strings.xml delete mode 100644 retrofit/src/test/java/com/vrgsoft/retrofit/ExampleUnitTest.java diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 93210cfcc94b508dcb348f555ce0be3d0a67eb07..fa8ca5310135dcc901465681509a5429d17bb8c2 100644 GIT binary patch delta 43 zcmV+`0M!431TnFDp(l98ND0SJ-lDG;P-;zwZy4bNKyD>aG4;1!c10ip>Na%FUK gZ)Rz9lQ01n5IiCj&Y(G9Y5oc#z98|FrIW$|k1&xO;{X5v diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2cca7f0..6c23501 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,7 +10,6 @@