Commit 6e3418ab authored 3 years ago by Benoit Marty

Merge branch 'release/1.3.0' into main

parents fed6f406 95c4ef98

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 10 additions, 0 deletions

CHANGES.md
build.gradle 5 additions, 6 deletions

build.gradle
dependencies.gradle 130 additions, 0 deletions

dependencies.gradle
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/wrapper/gradle-wrapper.properties 2 additions, 2 deletions

gradle/wrapper/gradle-wrapper.properties
matrix-sdk-android/build.gradle 49 additions, 58 deletions

matrix-sdk-android/build.gradle
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt 1 addition, 1 deletion

...src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt 11 additions, 7 deletions

...st/java/org/matrix/android/sdk/common/CommonTestHelper.kt
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt 168 additions, 0 deletions

...rg/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 1 addition, 1 deletion

...ndroid/src/main/java/org/matrix/android/sdk/api/Matrix.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt 1 addition, 0 deletions

.../main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt 2 additions, 2 deletions

...c/main/java/org/matrix/android/sdk/api/session/Session.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt 6 additions, 6 deletions

.../org/matrix/android/sdk/api/session/events/model/Event.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt 22 additions, 4 deletions

...rix/android/sdk/api/session/initsync/SyncStatusService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt 8 additions, 1 deletion

...java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt 38 additions, 3 deletions

.../matrix/android/sdk/api/session/pushers/PushersService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomStrippedState.kt 111 additions, 0 deletions

...x/android/sdk/api/session/room/model/RoomStrippedState.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt 1 addition, 1 deletion

...sdk/api/session/room/model/message/MessageAudioContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt 5 additions, 0 deletions

...roid/sdk/api/session/room/model/message/MessageContent.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt 1 addition, 1 deletion

...k/api/session/room/model/message/MessageDefaultContent.kt

with 573 additions and 94 deletions

Please register or to comment