Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14 #8630

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14 #8630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
751bd27
Bump org.matrix.rustcomponents:crypto-android from 0.3.10 to 0.3.14
dependabot[bot] Aug 25, 2023
0838a10
Bump memory allocated for tests
jmartinesp Aug 28, 2023
dc8230e
Ignore `LocaleFolder` lint error since we won't fix it.
jmartinesp Aug 28, 2023
d65459c
Try bumping the whole memory heap size in rust tests
jmartinesp Aug 28, 2023
fe51ee3
Try bumping heap size of gradle and the kotlin daemon as a last resort
jmartinesp Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests-rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="-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:
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
2 changes: 1 addition & 1 deletion matrix-sdk-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/lint/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<issue id="IconDuplicatesConfig" severity="error" />
<issue id="IconDuplicates" severity="error" />
<issue id="IconExpectedSize" severity="error" />
<issue id="LocaleFolder" severity="error" />
<issue id="LocaleFolder" severity="ignore" />

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