From 665e4e2f0ab374d738f5f8bfc2362bad25eb3b6b Mon Sep 17 00:00:00 2001 From: Taras <tarassmakula@gmail.com> Date: Fri, 24 Jun 2022 16:26:19 +0300 Subject: [PATCH] Add bcrypt dependency --- dependencies_groups.gradle | 1 + matrix-sdk-android/.idea/modules.xml | 8 ++++++++ matrix-sdk-android/.idea/workspace.xml | 24 ++++++++++++++++++++++-- matrix-sdk-android/build.gradle | 3 +++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 matrix-sdk-android/.idea/modules.xml diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index 76869fcc..e7b282cd 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -40,6 +40,7 @@ ext.groups = [ regex: [ ], group: [ + 'at.favre.lib', 'ch.qos.logback', 'com.adevinta.android', 'com.airbnb.android', diff --git a/matrix-sdk-android/.idea/modules.xml b/matrix-sdk-android/.idea/modules.xml new file mode 100644 index 00000000..2e6fa604 --- /dev/null +++ b/matrix-sdk-android/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/matrix-sdk-android.iml" filepath="$PROJECT_DIR$/.idea/matrix-sdk-android.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/matrix-sdk-android/.idea/workspace.xml b/matrix-sdk-android/.idea/workspace.xml index 8eff3cff..661daedb 100644 --- a/matrix-sdk-android/.idea/workspace.xml +++ b/matrix-sdk-android/.idea/workspace.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="AutoImportSettings"> - <option name="autoReloadType" value="SELECTIVE" /> + <option name="autoReloadType" value="NONE" /> </component> <component name="ChangeListManager"> - <list default="true" id="be17690a-027a-43dd-bbfb-d2511d7a1457" name="Changes" comment="" /> + <list default="true" id="be17690a-027a-43dd-bbfb-d2511d7a1457" name="Changes" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -25,10 +27,28 @@ <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> </component> + <component name="ProjectId" id="29IHIB4AXgst2A5gKeyrHe0gEnW" /> + <component name="ProjectViewState"> + <option name="hideEmptyMiddlePackages" value="true" /> + <option name="showLibraryContents" value="true" /> + </component> <component name="PropertiesComponent"> + <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> + <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> + <property name="RunOnceActivity.cidr.known.project.marker" value="true" /> + <property name="cidr.known.project.marker" value="true" /> <property name="dart.analysis.tool.window.visible" value="false" /> + <property name="show.migrate.to.gradle.popup" value="false" /> </component> + <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="be17690a-027a-43dd-bbfb-d2511d7a1457" name="Changes" comment="" /> + <created>1652793597485</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1652793597485</updated> + </task> <servers /> </component> </project> \ No newline at end of file diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index e89ef618..45934de7 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -181,6 +181,9 @@ dependencies { // Phone number https://github.com/google/libphonenumber implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.48' + //Bcrypt + implementation 'at.favre.lib:bcrypt:0.9.0' + testImplementation libs.tests.junit testImplementation 'org.robolectric:robolectric:4.7.3' //testImplementation 'org.robolectric:shadows-support-v4:3.0' -- GitLab