Skip to content

Commit 1f41c54

Browse files
authored
Merge pull request #8630 from vector-im/dependabot/gradle/org.matrix.rustcomponents-crypto-android-0.3.14
Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14
2 parents a3be028 + fe51ee3 commit 1f41c54

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.github/workflows/tests-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
# Enrich gradle.properties for CI/CD
1111
env:
12-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
12+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx3g" -Dkotlin.incremental=false
1313
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon
1414

1515
jobs:

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,10 @@ ext.initScreenshotTests = { project ->
331331
}
332332
}
333333

334+
tasks.withType(Test) {
335+
maxHeapSize = "2g"
336+
}
337+
334338
// Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
335339
// Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
336340
subprojects { project ->

matrix-sdk-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ dependencies {
216216

217217
implementation libs.google.phonenumber
218218

219-
rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.10")
219+
rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.14")
220220
// rustCryptoApi project(":library:rustCrypto")
221221

222222
testImplementation libs.tests.junit

tools/lint/lint.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<issue id="IconDuplicatesConfig" severity="error" />
1818
<issue id="IconDuplicates" severity="error" />
1919
<issue id="IconExpectedSize" severity="error" />
20-
<issue id="LocaleFolder" severity="error" />
20+
<issue id="LocaleFolder" severity="ignore" />
2121

2222
<!-- AlwaysShowAction is considered as an error to force ignoring the issue when detected -->
2323
<issue id="AlwaysShowAction" severity="error" />

0 commit comments

Comments
 (0)