Merge pull request #760 from vector-im/feature/diff_match_patch_submodule

Use diff_match_patch sources as dependency
This commit is contained in:
Benoit Marty 2019-12-16 15:02:29 +01:00 committed by GitHub
commit cfee6a43fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2483 additions and 10 deletions

View file

@ -19,7 +19,7 @@ Translations 🗣:
- -
Build 🧱: Build 🧱:
- - Include diff-match-patch sources as dependency
Changes in RiotX 0.10.0 (2019-12-10) Changes in RiotX 0.10.0 (2019-12-10)
=================================================== ===================================================

View file

@ -45,12 +45,6 @@ allprojects {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
google() google()
jcenter() jcenter()
maven {
url 'https://repo.adobe.com/nexus/content/repositories/public/'
content {
includeGroupByRegex "diff_match_patch"
}
}
} }
tasks.withType(JavaCompile).all { tasks.withType(JavaCompile).all {

1
diff-match-patch/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build

View file

@ -0,0 +1,8 @@
apply plugin: 'java-library'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
}
sourceCompatibility = "8"
targetCompatibility = "8"

File diff suppressed because it is too large Load diff

View file

@ -1 +1 @@
include ':vector', ':matrix-sdk-android', ':matrix-sdk-android-rx' include ':vector', ':matrix-sdk-android', ':matrix-sdk-android-rx', ':diff-match-patch'

View file

@ -229,6 +229,7 @@ dependencies {
implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android")
implementation project(":matrix-sdk-android-rx") implementation project(":matrix-sdk-android-rx")
implementation project(":diff-match-patch")
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@ -341,8 +342,6 @@ dependencies {
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
} }
implementation 'diff_match_patch:diff_match_patch:current'
implementation "androidx.emoji:emoji-appcompat:1.0.0" implementation "androidx.emoji:emoji-appcompat:1.0.0"
// TESTS // TESTS