Skip to content

Commit f5f4d4a

Browse files
committed
Merge branch 'release/1.6.3' into main
2 parents 9f797e4 + 637b148 commit f5f4d4a

File tree

135 files changed

+1886
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1886
-458
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To get started with Dependabot version updates, you'll need to specify which
22
# package ecosystems to update and where the package manifests are located.
33
# Please see the documentation for all configuration options:
4-
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
55

66
version: 2
77
updates:
@@ -13,7 +13,7 @@ updates:
1313
reviewers:
1414
- "vector-im/element-android-reviewers"
1515
ignore:
16-
- dependency-name: "*github-script*"
16+
- dependency-name: "*"
1717
# Updates for Gradle dependencies used in the app
1818
- package-ecosystem: gradle
1919
directory: "/"
@@ -22,5 +22,6 @@ updates:
2222
open-pull-requests-limit: 200
2323
reviewers:
2424
- "vector-im/element-android-reviewers"
25-
ignore:
26-
- dependency-name: com.google.zxing:core
25+
allow:
26+
- dependency-name: "io.element.android:wysiwyg"
27+
- dependency-name: "org.matrix.rustcomponents:crypto-android"

CHANGES.md

Lines changed: 23 additions & 0 deletions

dependencies.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ext.libs = [
101101
],
102102
element : [
103103
'opusencoder' : "io.element.android:opusencoder:1.1.0",
104-
'wysiwyg' : "io.element.android:wysiwyg:2.2.1"
104+
'wysiwyg' : "io.element.android:wysiwyg:2.2.2"
105105
],
106106
squareup : [
107107
'moshi' : "com.squareup.moshi:moshi:$moshi",
@@ -172,6 +172,7 @@ ext.libs = [
172172
'kluent' : "org.amshove.kluent:kluent-android:1.73",
173173
'timberJunitRule' : "net.lachlanmckee:timber-junit-rule:1.0.1",
174174
'junit' : "junit:junit:4.13.2",
175+
'robolectric' : "org.robolectric:robolectric:4.9",
175176
]
176177
]
177178

dependencies_groups.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ ext.groups = [
189189
'org.codehaus.groovy',
190190
'org.codehaus.mojo',
191191
'org.codehaus.woodstox',
192+
'org.conscrypt',
192193
'org.eclipse.ee4j',
193194
'org.ec4j.core',
194195
'org.freemarker',
@@ -221,6 +222,7 @@ ext.groups = [
221222
'org.ow2.asm',
222223
'org.ow2.asm',
223224
'org.reactivestreams',
225+
'org.robolectric',
224226
'org.slf4j',
225227
'org.sonatype.oss',
226228
'org.testng',
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Hlavní změny v této verzi: Element Android nyní používá Crypto Rust SDK.
2+
Úplný seznam změn: https://github.com/vector-im/element-android/releases
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Hlavní změny v této verzi: Element Android nyní používá Crypto Rust SDK.
2+
Úplný seznam změn: https://github.com/vector-im/element-android/releases
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Hlavní změny v této verzi: Element Android nyní používá Crypto Rust SDK.
2+
Úplný seznam změn: https://github.com/vector-im/element-android/releases
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Die wichtigsten Änderungen in dieser Version: Element Android nutzt nun das Crypto-Rust-SDK.
2+
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Die wichtigsten Änderungen in dieser Version: Element Android nutzt nun das Crypto-Rust-SDK.
2+
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Die wichtigsten Änderungen in dieser Version: Element Android nutzt nun das Crypto-Rust-SDK.
2+
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

0 commit comments

Comments
 (0)