Skip to content

Migrated to Gradle Daemon toolchain #3208

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

Merged
sosnovsky merged 5 commits into from
May 22, 2026
Merged

Migrated to Gradle Daemon toolchain #3208

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
dfa55b7
Migrate to Gradle Daemon toolchain.| #3207
DenBond7 May 10, 2026
b0749e2
Updated gradle to 9.5.0| #3207
DenBond7 May 10, 2026
55d7dc0
Temporarily disabled SubmitPublicKeyAfterCreationNonGoogleAccountFlow…
DenBond7 May 10, 2026
7a0574f
Added CI failure debug script and updated Semaphore configuration
DenBond7 May 11, 2026
5125261
Merge branch 'master' into Issue_3207_migrate_to_gradle_toolchain
DenBond7 May 22, 2026
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
1 change: 0 additions & 1 deletion .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 9 additions & 14 deletions FlowCrypt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ if (propertiesFile.exists()) {
keystoreProperties.load(FileInputStream(propertiesFile))
}

kotlin {
jvmToolchain(21)

compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
}
}

android {
compileSdk = rootProject.extra["compileSdkVersion"] as Int
namespace = "com.flowcrypt.email"
Expand Down Expand Up @@ -393,20 +402,6 @@ easylauncher {
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}


kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
}
}

tasks.register("checkCorrectBranch") {
if (!grgit.branch.current().name.equals("master")) {
throw GradleException("Please use 'master' branch to generate a release build")
Expand Down
2 changes: 2 additions & 0 deletions ...dTest/java/com/flowcrypt/email/ui/SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.RecordedRequest
import org.eclipse.angus.mail.imap.IMAPFolder
import org.junit.Assert.assertTrue
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.rules.RuleChain
Expand All @@ -56,6 +57,7 @@ import java.util.concurrent.TimeUnit
@MediumTest
@RunWith(AndroidJUnit4::class)
@FlowCryptTestSettings(useIntents = true, useCommonIdling = false)
@Ignore("temporary disabled")

@DenBond7 DenBond7 May 22, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one fails sometimes. It will be fixed in #3211

class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
override val activityScenarioRule = activityScenarioRule<MainActivity>()

Expand Down
16 changes: 16 additions & 0 deletions gradle/gradle-daemon-jvm.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
# Contributors: denbond7
#
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/f257be9f04bfdf169051808541767806/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/1dcbacacca32618bd21ec5465779ade1/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1e91f45234d88a64dafb961c93ddc75a/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/5a88b04b5e582b332d2e6bc12b45f1b9/redirect
toolchainVersion=21
2 changes: 1 addition & 1 deletion script/ci-after-fail-debug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ if [[ "$NETWORK_FAILURE" -eq 1 ]]; then
fi

print_section "Network status"
echo "All network checks passed"
echo "All network checks passed"
5 changes: 4 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
* Contributors: DenBond7
* Contributors: denbond7
*/

pluginManagement {
Expand All @@ -10,6 +10,9 @@ pluginManagement {
gradlePluginPortal()
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}
dependencyResolutionManagement {
repositories {
google()
Expand Down
Loading