From b4ceaefeab13b01b3393dbeac74396d541075324 Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Tue, 22 Feb 2022 19:40:17 +0100 Subject: [PATCH] moves diff-match-patch module to library --- build.gradle | 2 +- {diff-match-patch => library/diff-match-patch}/.gitignore | 0 {diff-match-patch => library/diff-match-patch}/build.gradle | 0 .../main/java/name/fraser/neil/plaintext/diff_match_patch.java | 0 settings.gradle | 2 +- vector/build.gradle | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename {diff-match-patch => library/diff-match-patch}/.gitignore (100%) rename {diff-match-patch => library/diff-match-patch}/build.gradle (100%) rename {diff-match-patch => library/diff-match-patch}/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java (100%) diff --git a/build.gradle b/build.gradle index 2ac948f0a9..1bacc84d46 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,7 @@ project(":vector") { } } -project(":diff-match-patch") { +project(":library:diff-match-patch") { sonarqube { skipProject = true } diff --git a/diff-match-patch/.gitignore b/library/diff-match-patch/.gitignore similarity index 100% rename from diff-match-patch/.gitignore rename to library/diff-match-patch/.gitignore diff --git a/diff-match-patch/build.gradle b/library/diff-match-patch/build.gradle similarity index 100% rename from diff-match-patch/build.gradle rename to library/diff-match-patch/build.gradle diff --git a/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java b/library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java similarity index 100% rename from diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java rename to library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java diff --git a/settings.gradle b/settings.gradle index d3b217c517..4f370a6684 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ include ':vector' include ':matrix-sdk-android' -include ':diff-match-patch' include ':attachment-viewer' include ':multipicker' include ':library:core-utils' include ':library:ui-styles' include ':library:jsonviewer' +include ':library:diff-match-patch' include ':matrix-sdk-android-flow' diff --git a/vector/build.gradle b/vector/build.gradle index 91a6319975..51929fa9f9 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -335,12 +335,12 @@ dependencies { implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android-flow") - implementation project(":diff-match-patch") implementation project(":multipicker") implementation project(":attachment-viewer") implementation project(":library:jsonviewer") implementation project(":library:ui-styles") implementation project(":library:core-utils") + implementation project(":library:diff-match-patch") implementation 'androidx.multidex:multidex:2.0.1' implementation libs.jetbrains.coroutinesCore