Migrated to Gradle Daemon toolchain#3208
Merged
Merged
Conversation
# Conflicts: # gradle/wrapper/gradle-wrapper.properties # script/ci-after-fail-debug.sh
DenBond7
commented
May 22, 2026
| @MediumTest | ||
| @RunWith(AndroidJUnit4::class) | ||
| @FlowCryptTestSettings(useIntents = true, useCommonIdling = false) | ||
| @Ignore("temporary disabled") |
Collaborator
Author
There was a problem hiding this comment.
This one fails sometimes. It will be fixed in #3211
Collaborator
Author
|
@sosnovsky, please review this PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
close #3207
Summary
This PR migrates the project to Gradle daemon JVM toolchain handling and aligns JVM/Kotlin toolchain configuration around Java 21 for more consistent CI/local builds.
What changed
gradle/gradle-daemon-jvm.properties(toolchain version 21 + platform URLs)settings.gradle.ktsorg.gradle.toolchains.foojay-resolver-convention(1.0.0)FlowCrypt/build.gradle.ktskotlin { jvmToolchain(21) ... }jvmTarget = JVM_21and opt-in compiler argjava { toolchain { ... } }blockFlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest.kt@Ignore("temporary disabled")Tests (delete all except exactly one):
To be filled by reviewers
I have reviewed that this PR... (tick whichever items you personally focused on during this review):