From 751bd27c9d4bcb4c82c0116229ac91493eff8682 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 23:02:56 +0000 Subject: [PATCH 1/5] Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14 Bumps [org.matrix.rustcomponents:crypto-android](https://github.com/matrix-org/matrix-rust-components-kotlin) from 0.3.10 to 0.3.14. - [Release notes](https://github.com/matrix-org/matrix-rust-components-kotlin/releases) - [Commits](https://github.com/matrix-org/matrix-rust-components-kotlin/compare/crypto-v0.3.10...crypto-v0.3.14) --- updated-dependencies: - dependency-name: org.matrix.rustcomponents:crypto-android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- matrix-sdk-android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 72719bb6d72..c7183b83658 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -216,7 +216,7 @@ dependencies { implementation libs.google.phonenumber - rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.10") + rustCryptoImplementation("org.matrix.rustcomponents:crypto-android:0.3.14") // rustCryptoApi project(":library:rustCrypto") testImplementation libs.tests.junit From 0838a10b650721d3fff14d1c9903d3a9deaeebeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 28 Aug 2023 15:34:52 +0200 Subject: [PATCH 2/5] Bump memory allocated for tests --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index edf07c097ad..dae89f7aff0 100644 --- a/build.gradle +++ b/build.gradle @@ -331,6 +331,10 @@ ext.initScreenshotTests = { project -> } } +tasks.withType(Test) { + maxHeapSize = "2g" +} + // Workaround to have KSP generated Kotlin code available in the IDE (for code completion) // Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02 subprojects { project -> From dc8230e435a857ba1b58f7cece233bb63bec94d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 28 Aug 2023 15:35:20 +0200 Subject: [PATCH 3/5] Ignore `LocaleFolder` lint error since we won't fix it. --- tools/lint/lint.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml index dbe30f22678..467b32bacdb 100644 --- a/tools/lint/lint.xml +++ b/tools/lint/lint.xml @@ -17,7 +17,7 @@ - + From d65459cc59ee3b24dd3676351b5b13efc4870b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 28 Aug 2023 16:05:40 +0200 Subject: [PATCH 4/5] Try bumping the whole memory heap size in rust tests --- .github/workflows/tests-rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml index 6713f29bafa..e60240fd45a 100644 --- a/.github/workflows/tests-rust.yml +++ b/.github/workflows/tests-rust.yml @@ -9,7 +9,7 @@ on: # Enrich gradle.properties for CI/CD env: - GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false + GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon jobs: From fe51ee3956a43c01a1ba94d9276f3fc027635da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 28 Aug 2023 17:17:41 +0200 Subject: [PATCH 5/5] Try bumping heap size of gradle and the kotlin daemon as a last resort --- .github/workflows/tests-rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml index e60240fd45a..803b0a08ab3 100644 --- a/.github/workflows/tests-rust.yml +++ b/.github/workflows/tests-rust.yml @@ -9,7 +9,7 @@ on: # Enrich gradle.properties for CI/CD env: - GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false + GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx5g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx3g" -Dkotlin.incremental=false CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon jobs: