Commit Graph

36 Commits

Author SHA1 Message Date
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc
Conflicts:
	dependencies.gradle
	gradle.properties
	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/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.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/HomeActivity.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/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
2021-10-21 17:31:11 +02:00
Benoit Marty 85983562fa No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
2021-10-19 19:06:27 +02:00
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
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
Benoit Marty 5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
Benoit Marty 529a7aedcb Cleanup useless values 2021-09-09 09:55:24 +02:00
Benoit Marty 80f23f1f3c Use Java 11 source code
https://developer.android.com/studio/releases/gradle-plugin#java-11
2021-09-02 09:50:34 +02:00
dependabot[bot] a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
Bumps appcompat from 1.3.0 to 1.3.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
Benoit Marty 692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0
Bump material from 1.3.0 to 1.4.0
2021-07-05 21:29:49 +02:00
dependabot[bot] 9ff1e20f07
Bump material from 1.3.0 to 1.4.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
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>
2021-07-02 23:07:53 +00:00
dependabot[bot] 752290424c
Bump core-ktx from 1.5.0 to 1.6.0
Bumps core-ktx from 1.5.0 to 1.6.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:07:55 +00:00
Benoit Marty 9c9d0a5d21 Add dep on ui_style to attachment viewer 2021-06-15 18:22:26 +02:00
dependabot[bot] 37176b9770
Bump recyclerview from 1.2.0 to 1.2.1
Bumps recyclerview from 1.2.0 to 1.2.1.

---
updated-dependencies:
- dependency-name: androidx.recyclerview:recyclerview
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-03 06:50:02 +00:00
dependabot[bot] 9b6a2c91f4
Bump core-ktx from 1.3.2 to 1.5.0
Bumps core-ktx from 1.3.2 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-20 13:08:12 +00:00
dependabot[bot] 5629d30932
Bump appcompat from 1.2.0 to 1.3.0
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-19 06:20:33 +00:00
Benoit Marty 796bb80868
Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0
Bump PhotoView from 2.1.4 to 2.3.0
2021-05-12 16:51:12 +02:00
Benoit Marty a377a595b9 Cleanup file, this belongs to the main build.gradle file 2021-05-03 21:13:25 +02:00
dependabot[bot] 5a53838194
Bump PhotoView from 2.1.4 to 2.3.0
Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases)
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-30 07:06:20 +00:00
dependabot[bot] 68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-08 07:22:33 +00:00
dependabot[bot] 30515492ca
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01
Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-25 06:31:57 +00:00
dependabot[bot] 8c23b0561b
Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02
Bumps recyclerview from 1.2.0-beta01 to 1.2.0-beta02.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-25 07:20:31 +00:00
Benoit Marty c985639691
Merge pull request #2883 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta01
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01
2021-02-21 00:09:48 +01:00
dependabot[bot] a7adcbcd78
Bump rxkotlin from 2.3.0 to 2.4.0
Bumps [rxkotlin](https://github.com/ReactiveX/RxKotlin) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/ReactiveX/RxKotlin/releases)
- [Commits](https://github.com/ReactiveX/RxKotlin/compare/2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:20:10 +00:00
dependabot[bot] a5a857f036
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01
Bumps recyclerview from 1.2.0-alpha06 to 1.2.0-beta01.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:19:35 +00:00
dependabot[bot] 108a81d338
Bump material from 1.3.0-alpha04 to 1.3.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0-alpha04 to 1.3.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0-alpha04...1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:22:53 +00:00
Onuray Sahin 23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
Benoit Marty 706736273c Migrate to ViewBindings (#1072) - WIP 2020-12-16 00:46:52 +01:00
Benoit Marty c426364618 Remove unused dependencies 2020-12-02 12:45:31 +01:00
Benoit Marty ff0f42900d Do not use deprecated Fragment.startActivityForResult anymore 2020-10-07 16:02:01 +02:00
Benoit Marty 9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Valere aa3e68f3fd Refactoring
Remove glide dependency + protect against cell reuse bugs
2020-07-09 10:08:55 +02:00
Valere a1db8653ab Basic Video Support 2020-07-08 20:09:55 +02:00
Valere 76133ab55e Simple overlay 2020-07-08 20:09:55 +02:00
Valere 4a2a6d34ae Initial commit 2020-07-08 20:09:55 +02:00