Commit graph

336 commits

Author SHA1 Message Date
SpiritCroc
11b1e54429 [merge,TMP,DNM] Build wysiwyg from local maven
Builders: until this is published on maven, `make android` for
https://github.com/SchildiChat/matrix-rich-text-editor
to publish to local repository

Change-Id: I88e073db5fffeb60d82514d1b07267a5c35447d3
2023-02-10 11:34:38 +01:00
SpiritCroc
51274af2fe Merge tag 'v1.5.24' into sc
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
Benoit Marty
5b5cbf52b2
Merge pull request #7971 from vector-im/dependabot/gradle/paparazzi-1.2.0
Bump paparazzi from 1.1.0 to 1.2.0
2023-02-07 14:35:21 +01:00
Benoit Marty
84f0f6f6dc
Merge pull request #7999 from vector-im/dependabot/gradle/com.google.android.material-material-1.8.0
Bump material from 1.7.0 to 1.8.0
2023-02-07 14:34:34 +01:00
Benoit Marty
c588ed5efa
Merge pull request #8055 from vector-im/dependabot/gradle/io.element.android-wysiwyg-0.23.0
Bump io.element.android:wysiwyg from 0.18.0 to 0.23.0
2023-02-07 14:31:27 +01:00
Benoit Marty
c8ef57e365
Merge pull request #8084 from vector-im/dependabot/gradle/flipper-0.178.1
Bump flipper from 0.177.0 to 0.178.1
2023-02-07 14:29:00 +01:00
dependabot[bot]
7460e76a47
Bump flipper from 0.177.0 to 0.178.1
Bumps `flipper` from 0.177.0 to 0.178.1.

Updates `com.facebook.flipper:flipper` from 0.177.0 to 0.178.1
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.177.0...v0.178.1)

Updates `com.facebook.flipper:flipper-network-plugin` from 0.177.0 to 0.178.1
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.177.0...v0.178.1)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-06 23:03:13 +00:00
dependabot[bot]
3d12bb1df9
Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.8.0 to 1.8.10
Bumps [org.jetbrains.kotlin:kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 23:07:11 +00:00
dependabot[bot]
bf113b7571
Bump com.android.tools.build:gradle from 7.3.1 to 7.4.1 (#8059)
Bumps com.android.tools.build:gradle from 7.3.1 to 7.4.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-02 10:21:45 +00:00
dependabot[bot]
a0bb3af871
Bump io.element.android:wysiwyg from 0.18.0 to 0.23.0
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.18.0 to 0.23.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.18.0...0.23.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-31 23:05:14 +00:00
dependabot[bot]
3104f62988
Bump sentry-android from 6.12.1 to 6.13.0
Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.12.1 to 6.13.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.12.1...6.13.0)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-27 23:03:50 +00:00
SpiritCroc
d8bd92c413 Merge tag 'v1.5.22' into sc
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
2023-01-26 19:49:36 +01:00
dependabot[bot]
b3845beb2d
Bump libphonenumber from 8.13.4 to 8.13.5
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.13.4 to 8.13.5.
- [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.13.4...v8.13.5)

---
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>
2023-01-24 23:04:48 +00:00
dependabot[bot]
6c5bc48c85
Bump material from 1.7.0 to 1.8.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/commits)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-24 23:02:47 +00:00
Benoit Marty
e87d312ff8
Merge pull request #7964 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.12.1
Bump sentry-android from 6.11.0 to 6.12.1
2023-01-24 14:50:04 +01:00
dependabot[bot]
ba6abf1bc0
Bump firebase-bom from 31.1.1 to 31.2.0
Bumps firebase-bom from 31.1.1 to 31.2.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-19 23:04:48 +00:00
dependabot[bot]
642ed61309
Bump paparazzi from 1.1.0 to 1.2.0
Bumps `paparazzi` from 1.1.0 to 1.2.0.

Updates `paparazzi` from 1.1.0 to 1.2.0
- [Release notes](https://github.com/cashapp/paparazzi/releases)
- [Changelog](https://github.com/cashapp/paparazzi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cashapp/paparazzi/compare/1.1.0...1.2.0)

Updates `paparazzi-gradle-plugin` from 1.1.0 to 1.2.0
- [Release notes](https://github.com/cashapp/paparazzi/releases)
- [Changelog](https://github.com/cashapp/paparazzi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cashapp/paparazzi/compare/1.1.0...1.2.0)

---
updated-dependencies:
- dependency-name: app.cash.paparazzi:paparazzi
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: app.cash.paparazzi:paparazzi-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-18 23:02:43 +00:00
dependabot[bot]
a4498cdb11
Bump sentry-android from 6.11.0 to 6.12.1
Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.11.0 to 6.12.1.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.11.0...6.12.1)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-17 23:02:47 +00:00
Benoit Marty
0ecc291bdb
Merge pull request #7958 from vector-im/dependabot/gradle/io.element.android-wysiwyg-0.18.0
Bump wysiwyg from 0.17.0 to 0.18.0
2023-01-17 16:49:25 +01:00
dependabot[bot]
bc4f1f1ec0
Bump wysiwyg from 0.17.0 to 0.18.0
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.17.0 to 0.18.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.17.0...0.18.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-16 23:03:48 +00:00
dependabot[bot]
a8d2f40475
Bump flipper from 0.176.1 to 0.177.0
Bumps `flipper` from 0.176.1 to 0.177.0.

Updates `flipper` from 0.176.1 to 0.177.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.176.1...v0.177.0)

Updates `flipper-network-plugin` from 0.176.1 to 0.177.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.176.1...v0.177.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-16 23:02:58 +00:00
SpiritCroc
d4cb55eeaa Merge tag 'v1.5.20' into sc
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
2023-01-13 14:50:46 +01:00
Benoit Marty
f3e56cfa5c
Merge pull request #7940 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.6.0
Bump appcompat from 1.5.1 to 1.6.0
2023-01-13 10:49:00 +01:00
dependabot[bot]
d55f1efd63
Bump wysiwyg from 0.15.0 to 0.17.0
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.15.0 to 0.17.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.15.0...0.17.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-13 00:17:34 +00:00
dependabot[bot]
a4a7fa69e8
Bump appcompat from 1.5.1 to 1.6.0
Bumps appcompat from 1.5.1 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 23:02:02 +00:00
Benoit Marty
242596744a Use Fragment 1.6.0 alpha to fix issue with test
https://issuetracker.google.com/issues/128612536
2023-01-11 12:13:45 +01:00
dependabot[bot]
6c50c75220 Bump espresso from 3.4.0 to 3.5.1
Bumps `espresso` from 3.4.0 to 3.5.1.

Updates `espresso-core` from 3.4.0 to 3.5.1

Updates `espresso-contrib` from 3.4.0 to 3.5.1

Updates `espresso-intents` from 3.4.0 to 3.5.1

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
dependabot[bot]
136282d5b1 Bump kotlin-gradle-plugin from 1.7.22 to 1.8.0
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.7.22 to 1.8.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
dependabot[bot]
48b54b402b Bump androidxTest from 1.4.0 to 1.5.0
Bumps `androidxTest` from 1.4.0 to 1.5.0.

Updates `core` from 1.4.0 to 1.5.0

Updates `runner` from 1.4.0 to 1.5.0

Updates `rules` from 1.4.0 to 1.5.0

---
updated-dependencies:
- dependency-name: androidx.test:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
Benoit Marty
c76a9c1697
Merge pull request #7869 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.11.0
Bump sentry-android from 6.9.2 to 6.11.0
2023-01-11 10:59:59 +01:00
Benoit Marty
d69d734bc3
Merge pull request #7774 from vector-im/dependabot/gradle/flipper-0.176.1
Bump flipper from 0.176.0 to 0.176.1
2023-01-11 10:15:25 +01:00
dependabot[bot]
29f17ede42
Bump sentry-android from 6.9.2 to 6.11.0
Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.9.2 to 6.11.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.9.2...6.11.0)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 09:14:53 +00:00
Benoit Marty
3cefdfb147
Merge pull request #7884 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.5
Bump junit from 1.1.3 to 1.1.5
2023-01-11 10:12:32 +01:00
jonnyandrew
b7073cb104
[Rich text editor] Update list item bullet appearance (#7930) 2023-01-10 17:04:39 +00:00
dependabot[bot]
cc334bcc13
Bump junit from 1.1.3 to 1.1.5
Bumps junit from 1.1.3 to 1.1.5.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-10 13:15:51 +00:00
dependabot[bot]
0511191e51
Bump libphonenumber from 8.13.3 to 8.13.4
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.13.3 to 8.13.4.
- [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.13.3...v8.13.4)

---
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>
2023-01-06 23:04:16 +00:00
dependabot[bot]
8784b7d3b7
Bump wysiwyg from 0.13.0 to 0.14.0 (#7902)
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.13.0...0.14.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-06 18:18:15 +00:00
jonnyandrew
bbb0036647
[Rich text editor] Add list formatting buttons to the rich text editor (#7887) 2023-01-05 13:07:19 +00:00
Maxime NATUREL
12ccf13171 Use Firebase BOM 2023-01-04 16:02:04 +01:00
SpiritCroc
25dddf7566 Merge tag 'v1.5.16' into sc
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	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/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
Benoit Marty
882c58efdd
Merge pull request #7823 from vector-im/dependabot/gradle/org.maplibre.gl-android-sdk-9.6.0
Bump android-sdk from 9.5.2 to 9.6.0
2022-12-22 21:11:15 +01:00
dependabot[bot]
eb30b51d6b
Bump libphonenumber from 8.13.1 to 8.13.3
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.13.1 to 8.13.3.
- [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.13.1...v8.13.3)

---
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-12-21 23:04:04 +00:00
jonnyandrew
50466792c6
[Rich text editor] Add support for links in the rich text editor (#7746) 2022-12-21 10:40:19 +00:00
dependabot[bot]
ea09d3ae73
Bump android-sdk from 9.5.2 to 9.6.0
Bumps [android-sdk](https://github.com/maplibre/maplibre-gl-native) from 9.5.2 to 9.6.0.
- [Release notes](https://github.com/maplibre/maplibre-gl-native/releases)
- [Changelog](https://github.com/maplibre/maplibre-gl-native/blob/main/CHANGELOG.md)
- [Commits](https://github.com/maplibre/maplibre-gl-native/compare/android-v9.5.2...android-v9.6.0)

---
updated-dependencies:
- dependency-name: org.maplibre.gl:android-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-19 23:04:33 +00:00
dependabot[bot]
67edf66856
Bump sentry-android from 6.9.0 to 6.9.2 (#7731)
Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.9.0 to 6.9.2.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.9.0...6.9.2)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-15 14:34:55 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	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/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
dependabot[bot]
312d778c86
Bump flipper from 0.176.0 to 0.176.1
Bumps `flipper` from 0.176.0 to 0.176.1.

Updates `flipper` from 0.176.0 to 0.176.1
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.176.0...v0.176.1)

Updates `flipper-network-plugin` from 0.176.0 to 0.176.1
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.176.0...v0.176.1)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 23:04:34 +00:00
dependabot[bot]
74d7e60380
Bump fragment from 1.5.4 to 1.5.5 (#7741)
Bumps `fragment` from 1.5.4 to 1.5.5.

Updates `fragment-ktx` from 1.5.4 to 1.5.5

Updates `fragment-testing` from 1.5.4 to 1.5.5

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-12 09:21:24 +01:00
dependabot[bot]
72ecd1bbc9
Bump kotlin-gradle-plugin from 1.7.21 to 1.7.22 (#7664)
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-08 10:51:20 +01:00
SpiritCroc
87100a8536 Merge remote-tracking branch 'upstream/develop' into sc
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00