Skip to content

Commit 5c55a32

Browse files
jmartinespjmartinesp
committed
Merge remote-tracking branch 'origin/develop' into resilience-rc
2 parents dac89ad + 546d039 commit 5c55a32

File tree

130 files changed

+3843
-1186
lines changed

Some content is hidden

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

130 files changed

+3843
-1186
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.1.3
14+
uses: danger/danger-js@11.1.4
1515
with:
1616
args: "--dangerfile tools/danger/dangerfile.js"
1717
env:

‎.github/workflows/post-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
restore-keys: |
5353
${{ runner.os }}-gradle-
5454
- name: Start synapse server
55-
uses: michaelkaye/setup-matrix-synapse@v1.0.3
55+
uses: michaelkaye/setup-matrix-synapse@v1.0.4
5656
with:
5757
uploadLogs: true
5858
httpPort: 8080

‎.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.1.3
69+
uses: danger/danger-js@11.1.4
7070
with:
7171
args: "--dangerfile tools/danger/dangerfile-lint.js"
7272
env:

‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/setup-python@v4
5151
with:
5252
python-version: 3.8
53-
- uses: michaelkaye/setup-matrix-synapse@v1.0.3
53+
- uses: michaelkaye/setup-matrix-synapse@v1.0.4
5454
with:
5555
uploadLogs: true
5656
httpPort: 8080

‎.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@bb266ff4dde9242060e2d5418e120a133586d488
13+
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
1414
with:
1515
project: Issue triage
1616
column: Incoming

‎.github/workflows/triage-labelled.yml

Lines changed: 126 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,23 @@ jobs:
2929
labels: ['Z-Labs']
3030
})
3131
32+
apply_Help-Wanted_label:
33+
name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
34+
runs-on: ubuntu-latest
35+
if: >
36+
contains(github.event.issue.labels.*.name, 'good first issue') ||
37+
contains(github.event.issue.labels.*.name, 'Hacktoberfest')
38+
steps:
39+
- uses: actions/github-script@v5
40+
with:
41+
script: |
42+
github.rest.issues.addLabels({
43+
issue_number: context.issue.number,
44+
owner: context.repo.owner,
45+
repo: context.repo.repo,
46+
labels: ['Help Wanted']
47+
})
48+
3249
move_needs_info_issues:
3350
name: X-Needs-Info issues to Need info column on triage board
3451
runs-on: ubuntu-latest
@@ -48,7 +65,13 @@ jobs:
4865
# Skip in forks
4966
if: >
5067
github.repository == 'vector-im/element-android' &&
51-
contains(github.event.issue.labels.*.name, 'X-Needs-Design')
68+
contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
69+
(contains(github.event.issue.labels.*.name, 'S-Critical') &&
70+
(contains(github.event.issue.labels.*.name, 'O-Frequent') ||
71+
contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
72+
(contains(github.event.issue.labels.*.name, 'S-Major') &&
73+
contains(github.event.issue.labels.*.name, 'O-Frequent')) ||
74+
contains(github.event.issue.labels.*.name, 'A11y'))
5275
steps:
5376
- uses: octokit/graphql-action@v2.x
5477
id: add_to_project
@@ -246,3 +269,105 @@ jobs:
246269
env:
247270
PROJECT_ID: "PN_kwDOAM0swc4ABTXY"
248271
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
272+
273+
ps_features1:
274+
name: Add labelled issues to PS features team 1
275+
runs-on: ubuntu-latest
276+
if: >
277+
contains(github.event.issue.labels.*.name, 'A-Polls') ||
278+
contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
279+
(contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
280+
!contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
281+
(contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
282+
contains(github.event.issue.labels.*.name, 'A-User-Settings'))
283+
steps:
284+
- uses: octokit/graphql-action@v2.x
285+
id: add_to_project
286+
with:
287+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
288+
query: |
289+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
290+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
291+
item {
292+
id
293+
}
294+
}
295+
}
296+
projectid: ${{ env.PROJECT_ID }}
297+
contentid: ${{ github.event.issue.node_id }}
298+
env:
299+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
300+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
301+
302+
ps_features2:
303+
name: Add labelled issues to PS features team 2
304+
runs-on: ubuntu-latest
305+
if: >
306+
contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
307+
contains(github.event.issue.labels.*.name, 'A-Broadcast')
308+
steps:
309+
- uses: octokit/graphql-action@v2.x
310+
id: add_to_project
311+
with:
312+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
313+
query: |
314+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
315+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
316+
item {
317+
id
318+
}
319+
}
320+
}
321+
projectid: ${{ env.PROJECT_ID }}
322+
contentid: ${{ github.event.issue.node_id }}
323+
env:
324+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
325+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
326+
327+
ps_features3:
328+
name: Add labelled issues to PS features team 3
329+
runs-on: ubuntu-latest
330+
if: >
331+
contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
332+
steps:
333+
- uses: octokit/graphql-action@v2.x
334+
id: add_to_project
335+
with:
336+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
337+
query: |
338+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
339+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
340+
item {
341+
id
342+
}
343+
}
344+
}
345+
projectid: ${{ env.PROJECT_ID }}
346+
contentid: ${{ github.event.issue.node_id }}
347+
env:
348+
PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
349+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
350+
351+
voip:
352+
name: Add labelled issues to VoIP project board
353+
runs-on: ubuntu-latest
354+
if: >
355+
contains(github.event.issue.labels.*.name, 'Team: VoIP')
356+
steps:
357+
- uses: octokit/graphql-action@v2.x
358+
id: add_to_project
359+
with:
360+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
361+
query: |
362+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
363+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
364+
item {
365+
id
366+
}
367+
}
368+
}
369+
projectid: ${{ env.PROJECT_ID }}
370+
contentid: ${{ github.event.issue.node_id }}
371+
env:
372+
PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
373+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

‎.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@bb266ff4dde9242060e2d5418e120a133586d488
27+
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
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@bb266ff4dde9242060e2d5418e120a133586d488
53+
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
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@bb266ff4dde9242060e2d5418e120a133586d488
31+
uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
3232
if: ${{ env.ALREADY_IN_BOARD == 'true' }}
3333
with:
3434
project: Issue triage

‎build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ buildscript {
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'
36-
classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0'
36+
classpath libs.squareup.paparazziPlugin
3737
// NOTE: Do not place your application dependencies here; they belong
3838
// in the individual module build.gradle files
3939
}
@@ -45,7 +45,7 @@ plugins {
4545
// Detekt
4646
id "io.gitlab.arturbosch.detekt" version "1.21.0"
4747
// Ksp
48-
id "com.google.devtools.ksp" version "1.7.20-1.0.6"
48+
id "com.google.devtools.ksp" version "1.7.20-1.0.7"
4949

5050
// Dependency Analysis
5151
id 'com.autonomousapps.dependency-analysis' version "1.13.1"
@@ -96,9 +96,9 @@ allprojects {
9696
}
9797
// Jitsi repo
9898
maven {
99-
url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2"
99+
url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2"
100100
// Note: to test Jitsi release you can use a local file like this:
101-
// url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
101+
// url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2"
102102
content {
103103
groups.jitsi.regex.each { includeGroupByRegex it }
104104
groups.jitsi.group.each { includeGroup it }
@@ -322,7 +322,7 @@ ext.initScreenshotTests = { project ->
322322
if (hasScreenshots) {
323323
project.apply plugin: 'app.cash.paparazzi'
324324
}
325-
project.dependencies { testCompileOnly "app.cash.paparazzi:paparazzi:1.0.0" }
325+
project.dependencies { testCompileOnly libs.squareup.paparazzi }
326326
project.android.testOptions.unitTests.all {
327327
def screenshotTestCapture = "**/*ScreenshotTest*"
328328
if (hasScreenshots) {

‎changelog.d/6195.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade Jitsi SDK to 6.2.2 and WebRtc to 1.106.1-jitsi-12039821.

0 commit comments

Comments
 (0)