SpiritCroc
|
0c7981dc26
|
Revert "Revert "Revert "Use Java 11 source code"""
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.
Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72
Conflicts:
attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android-rx/build.gradle
matrix-sdk-android/build.gradle
vector/build.gradle
|
2021-09-29 09:56:32 +02:00 |
|
SpiritCroc
|
4f93eb041c
|
Merge tag 'v1.3.0' into sc
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
|
2021-09-29 09:55:02 +02:00 |
Benoit Marty
|
1b262a4df8
|
Merge pull request #4071 from vector-im/tools/adm/connected_tests
Fixing no tests found when running vector:connectedAndroidTest
|
2021-09-24 09:53:04 +02:00 |
Adam Brown
|
7bd8890276
|
extracting orchestrator dependency to the dependencies.gradle file
|
2021-09-23 20:24:16 +01:00 |
Benoit Marty
|
93506d18fa
|
Display push counter on debug mode
|
2021-09-23 13:54:03 +02:00 |
|
Benoit Marty
|
1059f105bf
|
Move comment to the correct line
|
2021-09-23 13:54:03 +02:00 |
ariskotsomitopoulos
|
1dcf6b9539
|
Enhance dependencies handling to support Dependabot
|
2021-09-17 14:58:44 +03:00 |
|
ariskotsomitopoulos
|
87fefdc7bb
|
Add more dependencies to common dependencies.gradle
|
2021-09-15 20:22:52 +03:00 |
|
ariskotsomitopoulos
|
c89b2c0536
|
Optimize dependencies handling
|
2021-09-15 13:21:25 +03:00 |