Skip to content

Commit 10a1ea0

Browse files
committed
Merge branch 'develop' into hughns/msc3824-oidc-aware
2 parents b1cacb3 + d922126 commit 10a1ea0

File tree

310 files changed

+5449
-1683
lines changed

Some content is hidden

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

310 files changed

+5449
-1683
lines changed

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger
14-
uses: danger/danger-js@11.2.2
14+
uses: danger/danger-js@11.2.3
1515
with:
1616
args: "--dangerfile ./tools/danger/dangerfile.js"
1717
env:

.github/workflows/quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
yarn add danger-plugin-lint-report --dev
6767
- name: Danger lint
6868
if: always()
69-
uses: danger/danger-js@11.2.2
69+
uses: danger/danger-js@11.2.3
7070
with:
7171
args: "--dangerfile ./tools/danger/dangerfile-lint.js"
7272
env:

.github/workflows/triage-incoming.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
# Skip in forks
1111
if: github.repository == 'vector-im/element-android'
1212
steps:
13-
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
13+
- uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
1414
with:
1515
project: Issue triage
1616
column: Incoming

.github/workflows/triage-priority-bugs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
contains(github.event.issue.labels.*.name, 'A11y') &&
2525
contains(github.event.issue.labels.*.name, 'O-Frequent'))
2626
steps:
27-
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
27+
- uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
2828
with:
2929
project: Android App Team
3030
column: Important Issues & Topics (P1)
@@ -50,7 +50,7 @@ jobs:
5050
contains(github.event.issue.labels.*.name, 'A11y') &&
5151
contains(github.event.issue.labels.*.name, 'O-Frequent')))
5252
steps:
53-
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
53+
- uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
5454
with:
5555
project: Crypto Team
5656
column: Ready

.github/workflows/triage-unlabelled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
2929
fi
3030
- name: Move issue
31-
uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
31+
uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
3232
if: ${{ env.ALREADY_IN_BOARD == 'true' }}
3333
with:
3434
project: Issue triage

CHANGES.md

Lines changed: 34 additions & 0 deletions

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
3030
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
3131
classpath "com.likethesalad.android:stem-plugin:2.3.0"
32-
classpath 'org.owasp:dependency-check-gradle:8.0.1'
32+
classpath 'org.owasp:dependency-check-gradle:8.0.2'
3333
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
3434
classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
3535
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
@@ -41,14 +41,14 @@ buildscript {
4141

4242
plugins {
4343
// ktlint Plugin
44-
id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
44+
id "org.jlleitschuh.gradle.ktlint" version "11.1.0"
4545
// Detekt
4646
id "io.gitlab.arturbosch.detekt" version "1.22.0"
4747
// Ksp
48-
id "com.google.devtools.ksp" version "1.8.0-1.0.8"
48+
id "com.google.devtools.ksp" version "1.8.10-1.0.9"
4949

5050
// Dependency Analysis
51-
id 'com.autonomousapps.dependency-analysis' version "1.18.0"
51+
id 'com.autonomousapps.dependency-analysis' version "1.19.0"
5252
// Gradle doctor
5353
id "com.osacky.doctor" version "0.8.1"
5454
}

changelog.d/8045.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Rich text editor] Add code block, quote and indentation actions

dependencies.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ext.versions = [
66
'targetCompat' : JavaVersion.VERSION_11,
77
]
88

9-
def gradle = "7.3.1"
9+
def gradle = "7.4.1"
1010
// Ref: https://kotlinlang.org/releases.html
11-
def kotlin = "1.8.0"
11+
def kotlin = "1.8.10"
1212
def kotlinCoroutines = "1.6.4"
1313
def dagger = "2.44.2"
1414
def firebaseBom = "31.2.0"
@@ -18,7 +18,7 @@ def markwon = "4.6.2"
1818
def moshi = "1.14.0"
1919
def lifecycle = "2.5.1"
2020
def flowBinding = "1.2.0"
21-
def flipper = "0.177.0"
21+
def flipper = "0.178.1"
2222
def epoxy = "5.0.0"
2323
def mavericks = "3.0.1"
2424
def glide = "4.14.2"
@@ -27,15 +27,15 @@ def jjwt = "0.11.5"
2727
// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
2828
// the whole commit which set version 0.16.0-SNAPSHOT
2929
def vanniktechEmoji = "0.16.0-SNAPSHOT"
30-
def sentry = "6.12.1"
30+
def sentry = "6.13.0"
3131
// Use 1.6.0 alpha to fix issue with test
3232
def fragment = "1.6.0-alpha04"
3333
// Testing
3434
def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
3535
def espresso = "3.5.1"
3636
def androidxTest = "1.5.0"
3737
def androidxOrchestrator = "1.4.2"
38-
def paparazzi = "1.1.0"
38+
def paparazzi = "1.2.0"
3939

4040
ext.libs = [
4141
gradle : [
@@ -82,7 +82,7 @@ ext.libs = [
8282
'transition' : "androidx.transition:transition:1.2.0",
8383
],
8484
google : [
85-
'material' : "com.google.android.material:material:1.7.0",
85+
'material' : "com.google.android.material:material:1.8.0",
8686
'firebaseBom' : "com.google.firebase:firebase-bom:$firebaseBom",
8787
'messaging' : "com.google.firebase:firebase-messaging",
8888
'appdistributionApi' : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
@@ -103,7 +103,7 @@ ext.libs = [
103103
],
104104
element : [
105105
'opusencoder' : "io.element.android:opusencoder:1.1.0",
106-
'wysiwyg' : "io.element.android:wysiwyg:0.18.0"
106+
'wysiwyg' : "io.element.android:wysiwyg:1.0.0"
107107
],
108108
squareup : [
109109
'moshi' : "com.squareup.moshi:moshi:$moshi",
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: Především vylepšení funkce hlasového vysílání.
2+
Úplný seznam změn: https://github.com/vector-im/element-android/releases

0 commit comments

Comments
 (0)