mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 03:48:12 +03:00
Code Issues Projects Releases Packages Wiki Activity
22947 commits 161 branches 158 tags 270 MiB
Commit graph

436 commits

Author SHA1 Message Date
Benoit Marty
973a5f1d6e Version++ 2022-08-23 17:02:24 +02:00
dependabot[bot]
8a2894f038
Bump libphonenumber from 8.12.53 to 8.12.54 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.53 to 8.12.54.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.53...v8.12.54)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-22 05:58:19 +00:00
Adam Brown
cc74dcfb90
Merge pull request #6589 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.1 
Bump realm-gradle-plugin from 10.11.0 to 10.11.1
 2022-08-17 16:19:14 +01:00
Adam Brown
defd848363 updating version for next release cycle 2022-08-10 12:30:38 +01:00
dependabot[bot]
30a8f22028
Bump libphonenumber from 8.12.52 to 8.12.53 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.52 to 8.12.53.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.52...v8.12.53)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-04 23:10:43 +00:00
Adam Brown
67d4afa012 updating build versions for next release cycle 2022-07-29 09:02:17 +01:00
dependabot[bot]
f0165f69d3
Bump realm-gradle-plugin from 10.11.0 to 10.11.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.11.0 to 10.11.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.11.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.11.0...v10.11.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-20 13:21:00 +00:00
dependabot[bot]
6332668b8c
Bump libphonenumber from 8.12.51 to 8.12.52 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.51 to 8.12.52.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.51...v8.12.52)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-19 23:06:00 +00:00
Benoit Marty
4c496bb148 Version++ 2022-07-13 12:46:32 +02:00
ganfra
6d1dd089f0 Update versions 2022-06-30 16:58:51 +02:00
Adam Brown
054c0435a8
Merge pull request #6130 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.0 
Bump realm-gradle-plugin from 10.9.0 to 10.11.0
 2022-06-30 15:00:21 +01:00
dependabot[bot]
5a02bca442
Bump libphonenumber from 8.12.50 to 8.12.51 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.50 to 8.12.51.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.50...v8.12.51)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-29 23:09:57 +00:00
Adam Brown
0aacde9d9d updating version for next development cycle 
- also fixes wrong version in changes doc
 2022-06-22 13:48:56 +01:00
Adam Brown
8754f230d3 removing debug log 2022-06-21 09:15:28 +01:00
Adam Brown
a76b6e522b splitting unit and instrumentation test tasks so that we can configure the android plugin testCoverage parameter 
- there's a bug that causes the output to be invalid for unit tests
 2022-06-21 09:15:27 +01:00
Adam Brown
ded7b1e0d0 updating current version 2022-06-14 15:16:56 +01:00
dependabot[bot]
eba52ea54f
Bump okhttp-bom from 4.9.3 to 4.10.0 
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.9.3 to 4.10.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.3...parent-4.10.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-13 12:24:55 +00:00
Benoit Marty
aac2df85bb Version++ 2022-06-13 14:10:48 +02:00
dependabot[bot]
5689006c81
Bump libphonenumber from 8.12.49 to 8.12.50 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.49 to 8.12.50.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.49...v8.12.50)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-10 13:38:47 +00:00
dependabot[bot]
2d654da691 Bump realm-gradle-plugin from 10.9.0 to 10.11.0 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.9.0 to 10.11.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.11.0/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.11.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-10 13:25:27 +02:00
Adam Brown
a4721033c8
Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12 
Bump olm-sdk from 3.2.11 to 3.2.12
 2022-06-08 10:04:08 +01:00
ganfra
b6d73d872b Use backup key directly on olmMachine. 2022-06-07 19:57:44 +02:00
Michael Kaye
10125f4738
Merge pull request #6111 from vector-im/michaelk/sonarqube_fixes 
Sonarqube including coverage on each PR.
 2022-06-07 09:44:00 +01:00
dependabot[bot]
941d5844b5
Bump olm-sdk from 3.2.11 to 3.2.12 
Bumps olm-sdk from 3.2.11 to 3.2.12.

---
updated-dependencies:
- dependency-name: org.matrix.android:olm-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-03 01:03:37 +00:00
Benoit Marty
1c73e28226 Version++ 2022-05-31 17:58:09 +02:00
Benoit Marty
0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup 
Remove unused dependencies
 2022-05-30 15:41:10 +02:00
Adam Brown
d18e7ad001 Merge branch 'develop' of github.com:vector-im/element-android into michaelk/sonarqube_fixes 2022-05-30 10:07:43 +01:00
dependabot[bot]
c6751f00ab
Bump libphonenumber from 8.12.48 to 8.12.49 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.48 to 8.12.49.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.48...v8.12.49)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-27 23:07:12 +00:00
Michael Kaye
ba109a486f Update to build scripts to enable sonarqube reporting including coverage. 2022-05-25 13:35:40 +01:00
ganfra
42e5dcd50a Use release version 0.1.0 of crypto rust component 2022-05-18 19:01:57 +02:00
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Benoit Marty
8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty
1eb97f6cb8 Disable the undocumented warnings, there are too many :/ 2022-05-16 12:23:10 +02:00
ganfra
725e56db08 Merge branch 'develop' of https://github.com/vector-im/element-android into feature/fga/rust_upstream_develop 2022-05-12 19:39:10 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
Benoit Marty
67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty
5c7ee5ef58 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:05:46 +02:00
ganfra
88733784cd Add tests for extracting and migrate data 2022-05-10 15:17:12 +02:00
ganfra
43f5fa91d4 Update olm to 3.2.11 2022-05-10 15:15:47 +02:00
dependabot[bot]
6ed20589fb
Bump olm-sdk from 3.2.10 to 3.2.11 
Bumps olm-sdk from 3.2.10 to 3.2.11.

---
updated-dependencies:
- dependency-name: org.matrix.android:olm-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 23:10:42 +00:00
Benoit Marty
e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
Marcel
3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
dependabot[bot]
6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.47...v8.12.48)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-05 23:09:00 +00:00
ganfra
859d47453c Add local lib in case maven is broken 2022-05-05 11:45:38 +02:00
ganfra
83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
Benoit Marty
b319ef40ba Add files to document module and packages 2022-04-27 16:52:45 +02:00
Benoit Marty
250baf225c Suppress legacy Riot classes from being documented. 2022-04-27 16:31:53 +02:00
Benoit Marty
0449606f0b Dokka config: try to ignore org.matrix.android.sdk.internal.legacy.riot 2022-04-25 09:49:05 +02:00
Benoit Marty
51f7c68d3f Dokka config: emit a warning for undocumented elements 2022-04-25 09:49:05 +02:00
dependabot[bot]
ed0ef4ad81
Bump libphonenumber from 8.12.46 to 8.12.47 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.46 to 8.12.47.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.46...v8.12.47)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-20 23:08:25 +00:00
Adam Brown
441751a6ec updating release version in preparation for next cycle 2022-04-20 15:03:46 +01:00
Olivér Falvai
a8bbf29b42 Remove unused dependencies 2022-04-15 22:50:54 +02:00
Benoit Marty
e30c68fb82 Remove dokka dependencies classpath for this specific module, it's already declared in the main build.gradle file. 2022-04-13 13:45:06 +02:00
Benoit Marty
5c6b370c63 Add explicit-api compiler option for hte SDK module. Disabled for now. 2022-04-12 15:41:37 +02:00
Benoit Marty
4d49ccaf8c Configure Dokka plugin to generate Kdoc 
Run `./gradlew matrix-sdk-android:dokkaHtml` to generate the Html documentation of the Matrix Android SDK
 2022-04-12 15:38:20 +02:00
Benoit Marty
02401f7f3d Version++ 2022-04-05 22:37:16 +02:00
dependabot[bot]
224eb7a968
Bump libphonenumber from 8.12.45 to 8.12.46 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.45 to 8.12.46.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.45...v8.12.46)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-31 23:08:28 +00:00
ganfra
e121007d20 Remove rust dependencies and use published aar 2022-03-28 18:15:46 +02:00
ganfra
ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
ganfra
adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint 
Changes room hierarchy endpoint to stable
 2022-03-11 17:05:13 +01:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.44...v8.12.45)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-10 23:09:19 +00:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
Adam Brown
60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
ericdecanini
047e767f34 Adds coroutinesTest to matrix sdk gradle 2022-03-09 12:18:46 +01:00
ganfra
b8637ddaf2 Merge branch 'develop' of https://github.com/vector-im/element-android into rust_upstream_develop 2022-03-03 19:52:57 +01:00
ariskotsomitopoulos
ae98185c9d Cleanup enabling threads from buildConfig 2022-02-28 17:39:40 +02:00
dependabot[bot]
ca56865dd1
Bump libphonenumber from 8.12.43 to 8.12.44 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.43 to 8.12.44.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.43...v8.12.44)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-24 23:10:16 +00:00
Benoit Marty
cc77afbf66 Version++ 2022-02-22 21:33:20 +01:00
dependabot[bot]
002332496a
Bump libphonenumber from 8.12.42 to 8.12.43 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.42 to 8.12.43.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.42...v8.12.43)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-09 23:11:56 +00:00
ganfra
c28a20dce3 Bump versions to 1.4.2 2022-02-09 12:55:33 +01:00
Aris Kotsomitopoulos
077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
Benoit Marty
aa12a73a05 Version++ 2022-02-03 15:51:04 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
Benoit Marty
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0 
AGP 7.1.0
 2022-02-01 13:57:15 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release." 
This reverts commit 2efa67e587.
 2022-01-31 14:53:43 +01:00
Benoit Marty
2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
dependabot[bot]
c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.41 to 8.12.42.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.41...v8.12.42)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-27 23:11:05 +00:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
Benoit Marty
fe5109fead Version++ 2022-01-25 21:48:18 +01:00
ariskotsomitopoulos
38f193fbd5 Add LightweightSettingsStorage in sdk 
Enable thread awareness when threads are disabled
Enhance enable/disable thread messages to app & sdk
Add Shared PReferences to sdk
 2022-01-19 18:52:02 +02:00
Benoit Marty
b71ac4d8fa
Revert "Bump realm-gradle-plugin from 10.9.0 to 10.10.0" 2022-01-19 15:51:51 +01:00
dependabot[bot]
1e99e12857
Bump realm-gradle-plugin from 10.9.0 to 10.10.0 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.9.0 to 10.10.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.10.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 23:08:13 +00:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
Benoit Marty
c59bb5740a Add comment after merge of #4952 2022-01-17 15:24:51 +01:00
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	.github/workflows/integration.yml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
 2022-01-12 18:20:50 +02:00
Benoit Marty
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement 
Trying to fix integration tests
 2022-01-12 17:11:16 +01:00
dependabot[bot]
1951130c43
Bump libphonenumber from 8.12.40 to 8.12.41 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.40 to 8.12.41.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.40...v8.12.41)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-11 23:07:26 +00:00
Benoit Marty
848a7f4062 Version++ 
Also add comment about the new versioning strategy
 2022-01-11 17:44:04 +01:00
ariskotsomitopoulos
3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
Benoit Marty
ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +01:00
ariskotsomitopoulos
41bf1ccc07 Remove adb timeout 2022-01-07 11:03:54 +02:00
ariskotsomitopoulos
abf8932747 fix typo 2022-01-06 12:25:19 +02:00
ariskotsomitopoulos
261030f51e - Fix integration tests (still not perfect while github actions are very very limited for that) 
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
 2022-01-05 23:42:57 +02:00
ariskotsomitopoulos
c2183800d3 Github actions improvement test 2022-01-03 12:14:14 +02:00
ariskotsomitopoulos
694b8de034 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
 2022-01-03 11:08:22 +02:00
dependabot[bot]
863b201793
Bump libphonenumber from 8.12.39 to 8.12.40 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.39 to 8.12.40.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.39...v8.12.40)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-23 23:07:37 +00:00