Commit Graph

378 Commits

Author SHA1 Message Date
Marcus Hoffmann 1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
2021-04-09 12:25:47 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
Benoit Marty 5edf7ca520 Version++ 2021-03-16 22:31:25 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-03-14 10:58:57 +01:00
Benoit Marty b5fa61c8aa
Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0
Bump barista from 3.8.0 to 3.9.0
2021-03-11 22:44:54 +01:00
Benoit Marty 4b8c59a23b Fix crash on ViewSource of event 2021-03-11 14:14:55 +01:00
dependabot[bot] 507eba3ddb
Bump barista from 3.8.0 to 3.9.0
Bumps barista from 3.8.0 to 3.9.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-10 21:08:12 +00:00
Benoit Marty 4e3ad91c67 Version++ 2021-03-10 22:05:31 +01:00
Benoit Marty 263ad899d8 Setup com.likethesalad.android:string-reference to have compilation time build of Strings resource with the app_name 2021-03-03 17:30:57 +01:00
Onuray Sahin 8b39eabc0f Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin a623395585 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
dependabot[bot] a9f923591d
Bump barista from 3.7.0 to 3.8.0
Bumps barista from 3.7.0 to 3.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-02 15:32:08 +00:00
Benoit Marty 7d7e4a0e6d
Merge pull request #2945 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.1
Bump big_image_viewer_version from 1.7.0 to 1.7.1
2021-03-02 16:30:57 +01:00
dependabot[bot] 161804be0d
Bump big_image_viewer_version from 1.7.0 to 1.7.1
Bumps `big_image_viewer_version` from 1.7.0 to 1.7.1.

Updates `BigImageViewer` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageLoader` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `ProgressPieIndicator` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageViewFactory` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-02 10:39:41 +00:00
Benoit Marty 32e7845c2b
Merge pull request #2943 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.19
Bump libphonenumber from 8.12.18 to 8.12.19
2021-03-02 11:39:38 +01:00
dependabot[bot] 8c87716013
Bump libphonenumber from 8.12.18 to 8.12.19
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19.
- [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.18...v8.12.19)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-02 06:59:54 +00:00
dependabot[bot] 5f29668c27
Bump epoxy_version from 4.4.1 to 4.4.2
Bumps `epoxy_version` from 4.4.1 to 4.4.2.

Updates `epoxy` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-02 06:57:55 +00:00
Benoit Marty f7bcc521d2
Merge pull request #2917 from vector-im/dependabot/gradle/epoxy_version-4.4.1
Bump epoxy_version from 4.4.0 to 4.4.1
2021-03-01 10:56:22 +01:00
Benoit Marty 3a20792668
Merge pull request #2918 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta02
Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02
2021-03-01 10:56:10 +01:00
SpiritCroc ff08370cd7 Increment version
Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b
2021-02-26 12:59:31 +01:00
dependabot[bot] f6123d8dfd
Bump daggerVersion from 2.32 to 2.33
Bumps `daggerVersion` from 2.32 to 2.33.

Updates `dagger` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Updates `dagger-compiler` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-26 07:14:10 +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
dependabot[bot] 6ec8be0d35
Bump epoxy_version from 4.4.0 to 4.4.1
Bumps `epoxy_version` from 4.4.0 to 4.4.1.

Updates `epoxy` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-glide-preloading` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-processor` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-paging` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-25 07:18:51 +00:00
dependabot[bot] 76923ad88a Bump alerter from 5.1.2 to 7.0.1
Bumps [alerter](https://github.com/Tapadoo/Alerter) from 5.1.2 to 7.0.1.
- [Release notes](https://github.com/Tapadoo/Alerter/releases)
- [Changelog](https://github.com/Tapadoo/Alerter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Tapadoo/Alerter/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-21 16:16:55 +01:00
dependabot[bot] 4465d87eb8 Bump browser from 1.2.0 to 1.3.0
Bumps browser from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-21 11:10:00 +01:00
Benoit Marty 370651ab56 Dependabot will create only 1 PR to upgrade RxBinding dependencies 2021-02-21 10:43:35 +01: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
Benoit Marty 580c48d4f9
Merge pull request #2868 from vector-im/dependabot/gradle/com.google.android-flexbox-2.0.1
Bump flexbox from 1.1.1 to 2.0.1
2021-02-21 00:09:15 +01:00
Benoit Marty e612e66ac9
Merge pull request #2865 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-material-3.1.0
Bump rxbinding-material from 3.0.0 to 3.1.0
2021-02-21 00:08:16 +01:00
Benoit Marty ec2493c03c
Merge pull request #2869 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.0
Bump fragment-ktx from 1.3.0-beta01 to 1.3.0
2021-02-21 00:07:56 +01:00
Benoit Marty 4a510d583d
Merge pull request #2876 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.5.0
Bump work-runtime-ktx from 2.4.0 to 2.5.0
2021-02-21 00:07:28 +01:00
Benoit Marty ff4643be8c
Merge pull request #2858 from vector-im/dependabot/gradle/io.reactivex.rxjava2-rxkotlin-2.4.0
Bump rxkotlin from 2.3.0 to 2.4.0
2021-02-21 00:07:01 +01:00
SpiritCroc ca0b360875 Merge tag 'v1.1.0' into sc
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
2021-02-20 15:41:01 +01:00
Benoit Marty 5a54899835
Merge pull request #2866 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.0
Bump big_image_viewer_version from 1.6.2 to 1.7.0
2021-02-20 11:29:08 +01:00
Benoit Marty 183c104ff3
Merge pull request #2874 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.0
Bump zxcvbn from 1.2.7 to 1.4.0
2021-02-20 11:26:34 +01:00
Benoit Marty d4532089a9
Merge pull request #2870 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.2.6
Bump konfetti from 1.2.5 to 1.2.6
2021-02-20 11:26:08 +01:00
Benoit Marty 7eda5e1ef5
Merge pull request #2884 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.9.0
Bump lazythreetenbp from 0.7.0 to 0.9.0
2021-02-20 11:24:14 +01:00
dependabot[bot] 5320d16406
Bump work-runtime-ktx from 2.4.0 to 2.5.0
Bumps work-runtime-ktx from 2.4.0 to 2.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:22:58 +00:00
dependabot[bot] 94faa2dc11
Bump rxbinding-material from 3.0.0 to 3.1.0
Bumps [rxbinding-material](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:22:09 +00:00
Benoit Marty 40785e9a40
Merge pull request #2877 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-appcompat-3.1.0
Bump rxbinding-appcompat from 3.0.0 to 3.1.0
2021-02-20 11:21:11 +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
Benoit Marty 1a4617af17
Merge pull request #2872 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.0.1
Bump firebase-messaging from 21.0.0 to 21.0.1
2021-02-20 11:19:28 +01:00
dependabot[bot] c069582007
Bump fragment-ktx from 1.3.0-beta01 to 1.3.0
Bumps fragment-ktx from 1.3.0-beta01 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:19:23 +00:00
Benoit Marty 17ddab585a
Merge pull request #2878 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.18
Bump libphonenumber from 8.10.23 to 8.12.18
2021-02-20 11:19:05 +01:00
Benoit Marty 120ed41507
Merge pull request #2860 from vector-im/dependabot/gradle/androidx.autofill-autofill-1.1.0
Bump autofill from 1.0.0 to 1.1.0
2021-02-20 11:18:10 +01:00
Benoit Marty dcb96593ec
Merge pull request #2881 from vector-im/dependabot/gradle/com.google.android.material-material-1.3.0
Bump material from 1.3.0-alpha04 to 1.3.0
2021-02-20 11:17:51 +01:00
Benoit Marty a489ddda87
Merge pull request #2879 from vector-im/dependabot/gradle/epoxy_version-4.4.0
Bump epoxy_version from 4.1.0 to 4.4.0
2021-02-20 11:08:03 +01:00
dependabot[bot] 3ba71390b2
Bump lazythreetenbp from 0.7.0 to 0.9.0
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.7.0 to 0.9.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.7.0...0.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:23:10 +00:00