Skip to content

Commit 7ce1842

Browse files
author
ganfra
committed
Merge branch 'release/1.5.28' into main
2 parents f637996 + 7282c30 commit 7ce1842

File tree

242 files changed

+3254
-1614
lines changed

Some content is hidden

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

242 files changed

+3254
-1614
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v3
5252
with:
5353
# https://github.com/actions/checkout/issues/881
54-
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
54+
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
5555
- name: Configure gradle
5656
uses: gradle/gradle-build-action@v2
5757
with:

.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.3
14+
uses: danger/danger-js@11.2.4
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.3
69+
uses: danger/danger-js@11.2.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
@@ -111,7 +111,7 @@ jobs:
111111
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
112112
ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
113113
if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
114-
run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
114+
run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
115115

116116
- name: Format unit test results
117117
if: always()

CHANGES.md

Lines changed: 24 additions & 0 deletions

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ buildscript {
2626
classpath libs.gradle.hiltPlugin
2727
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.2.0'
2828
classpath 'com.google.gms:google-services:4.3.15'
29-
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
29+
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929'
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.1.0'
32+
classpath 'org.owasp:dependency-check-gradle:8.1.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,7 +41,7 @@ buildscript {
4141

4242
plugins {
4343
// ktlint Plugin
44-
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
44+
id "org.jlleitschuh.gradle.ktlint" version "11.3.1"
4545
// Detekt
4646
id "io.gitlab.arturbosch.detekt" version "1.22.0"
4747
// Ksp
@@ -203,10 +203,10 @@ if (launchTask.contains("coverage".toLowerCase())) {
203203
apply plugin: 'org.sonarqube'
204204

205205
// To run a sonar analysis:
206-
// Run './gradlew sonarqube -Dsonar.login=<REPLACE_WITH_SONAR_KEY>'
206+
// Run './gradlew sonar -Dsonar.login=<REPLACE_WITH_SONAR_KEY>'
207207
// The SONAR_KEY is stored in passbolt as Token Sonar Cloud Bma
208208

209-
sonarqube {
209+
sonar {
210210
properties {
211211
property "sonar.projectName", "element-android"
212212
property "sonar.projectKey", "vector-im_element-android"
@@ -225,7 +225,7 @@ sonarqube {
225225
}
226226

227227
project(":vector") {
228-
sonarqube {
228+
sonar {
229229
properties {
230230
property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
231231
// exclude source code from analyses separated by a colon (:)
@@ -236,13 +236,13 @@ project(":vector") {
236236
}
237237

238238
project(":library:external:diff-match-patch") {
239-
sonarqube {
239+
sonar {
240240
skipProject = true
241241
}
242242
}
243243

244244
//project(":matrix-sdk-android") {
245-
// sonarqube {
245+
// sonar {
246246
// properties {
247247
// property "sonar.sources", project(":matrix-sdk-android").android.sourceSets.main.java.srcDirs
248248
// // exclude source code from analyses separated by a colon (:)

dependencies.gradle

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

9-
def gradle = "7.4.1"
9+
def gradle = "7.4.2"
1010
// Ref: https://kotlinlang.org/releases.html
1111
def kotlin = "1.8.10"
1212
def kotlinCoroutines = "1.6.4"
1313
def dagger = "2.45"
14-
def firebaseBom = "31.2.1"
15-
def appDistribution = "16.0.0-beta05"
14+
def firebaseBom = "31.2.2"
15+
def appDistribution = "16.0.0-beta06"
1616
def retrofit = "2.9.0"
1717
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.178.1"
21+
def flipper = "0.183.0"
2222
def epoxy = "5.0.0"
2323
def mavericks = "3.0.1"
24-
def glide = "4.14.2"
24+
def glide = "4.15.0"
2525
def bigImageViewer = "1.8.1"
2626
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.14.0"
30+
def sentry = "6.15.0"
3131
// Use 1.6.0 alpha to fix issue with test
3232
def fragment = "1.6.0-alpha04"
3333
// Testing
@@ -59,7 +59,7 @@ ext.libs = [
5959
'fragmentTesting' : "androidx.fragment:fragment-testing:$fragment",
6060
'fragmentTestingManifest' : "androidx.fragment:fragment-testing-manifest:$fragment",
6161
'constraintLayout' : "androidx.constraintlayout:constraintlayout:2.1.4",
62-
'work' : "androidx.work:work-runtime-ktx:2.7.1",
62+
'work' : "androidx.work:work-runtime-ktx:2.8.0",
6363
'autoFill' : "androidx.autofill:autofill:1.1.0",
6464
'preferenceKtx' : "androidx.preference:preference-ktx:1.2.0",
6565
'junit' : "androidx.test.ext:junit:1.1.5",
@@ -70,7 +70,7 @@ ext.libs = [
7070
'datastore' : "androidx.datastore:datastore:1.0.0",
7171
'datastorepreferences' : "androidx.datastore:datastore-preferences:1.0.0",
7272
'pagingRuntimeKtx' : "androidx.paging:paging-runtime-ktx:2.1.2",
73-
'coreTesting' : "androidx.arch.core:core-testing:2.1.0",
73+
'coreTesting' : "androidx.arch.core:core-testing:2.2.0",
7474
'testCore' : "androidx.test:core:$androidxTest",
7575
'orchestrator' : "androidx.test:orchestrator:$androidxOrchestrator",
7676
'testRunner' : "androidx.test:runner:$androidxTest",
@@ -79,7 +79,7 @@ ext.libs = [
7979
'espressoContrib' : "androidx.test.espresso:espresso-contrib:$espresso",
8080
'espressoIntents' : "androidx.test.espresso:espresso-intents:$espresso",
8181
'viewpager2' : "androidx.viewpager2:viewpager2:1.0.0",
82-
'transition' : "androidx.transition:transition:1.2.0",
82+
'transition' : "androidx.transition:transition:1.4.1",
8383
],
8484
google : [
8585
'material' : "com.google.android.material:material:1.8.0",
@@ -88,7 +88,7 @@ ext.libs = [
8888
'appdistributionApi' : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
8989
'appdistribution' : "com.google.firebase:firebase-appdistribution:$appDistribution",
9090
// Phone number https://github.com/google/libphonenumber
91-
'phonenumber' : "com.googlecode.libphonenumber:libphonenumber:8.13.6"
91+
'phonenumber' : "com.googlecode.libphonenumber:libphonenumber:8.13.7"
9292
],
9393
dagger : [
9494
'dagger' : "com.google.dagger:dagger:$dagger",
@@ -103,7 +103,7 @@ ext.libs = [
103103
],
104104
element : [
105105
'opusencoder' : "io.element.android:opusencoder:1.1.0",
106-
'wysiwyg' : "io.element.android:wysiwyg:1.0.0"
106+
'wysiwyg' : "io.element.android:wysiwyg:1.1.1"
107107
],
108108
squareup : [
109109
'moshi' : "com.squareup.moshi:moshi:$moshi",
@@ -134,7 +134,7 @@ ext.libs = [
134134
'mavericksTesting' : "com.airbnb.android:mavericks-testing:$mavericks"
135135
],
136136
maplibre : [
137-
'androidSdk' : "org.maplibre.gl:android-sdk:9.6.0",
137+
'androidSdk' : "org.maplibre.gl:android-sdk:10.0.2",
138138
'pluginAnnotation' : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
139139
],
140140
mockk : [
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: Hlavně opravy chyb, zejména oprava zpráv, které se nezobrazovaly na časové ose.
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: Hlavně opravy chyb, zejména oprava zpráv, které se nezobrazovaly na časové ose.
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: Hlavně opravy chyb.
2+
Úplný seznam změn: https://github.com/vector-im/element-android/releases

0 commit comments

Comments
 (0)