From 5c22408d5e97fbb4a42f02453146e3bc6a83e08b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:05:38 +0000 Subject: [PATCH 1/5] Bump org.robolectric:robolectric from 4.14.1 to 4.16 Bumps [org.robolectric:robolectric](https://github.com/robolectric/robolectric) from 4.14.1 to 4.16. - [Release notes](https://github.com/robolectric/robolectric/releases) - [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.14.1...robolectric-4.16) --- updated-dependencies: - dependency-name: org.robolectric:robolectric dependency-version: '4.16' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- FlowCrypt/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 94a79fe6d..094630029 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -436,7 +436,7 @@ dependencies { testImplementation("com.squareup.okhttp3:mockwebserver:5.1.0") testImplementation("com.flextrade.jfixture:jfixture:2.7.2") testImplementation("com.shazam:shazamcrest:0.11") - testImplementation("org.robolectric:robolectric:4.14.1") + testImplementation("org.robolectric:robolectric:4.16") //we need it to test Parcelable implementation testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.10") testImplementation("junit:junit:4.13.2") From 98126dd0dd2d23f1e30d3501fe01f56fa2ce37e2 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Sun, 14 Sep 2025 15:28:38 +0300 Subject: [PATCH 2/5] Modified build.gradle.kts to fix deprecated code. --- FlowCrypt/build.gradle.kts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index e04001550..d984fd1bd 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -193,11 +193,6 @@ android { viewBinding = true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn") - } - packaging { resources.excludes += setOf( "META-INF/DEPENDENCIES", @@ -328,6 +323,13 @@ easylauncher { } } +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + 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") From 31e34b518bfdcb5f55d0c70e918b2b5e44ae8c7d Mon Sep 17 00:00:00 2001 From: denbond7 Date: Sun, 14 Sep 2025 16:16:28 +0300 Subject: [PATCH 3/5] Fixed compilation issue for roboelectric. --- .idea/compiler.xml | 2 +- FlowCrypt/build.gradle.kts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56e9..b86273d94 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index d984fd1bd..068dc18d9 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -184,8 +184,8 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } buildFeatures { @@ -323,9 +323,16 @@ easylauncher { } } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } +} + + kotlin { compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") } } From 7ac13d0749af5bedc3b87bed40a0ad573447e7ec Mon Sep 17 00:00:00 2001 From: denbond7 Date: Sun, 14 Sep 2025 16:27:54 +0300 Subject: [PATCH 4/5] Updated semaphore.yml to use Java 21 --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 2172e7a3a..9b094e639 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -40,7 +40,7 @@ global_job_config: - ping fel.localhost -c 1 - ping fel.flowcrypt.test -c 1 # use JAVA 17 by default - - sem-version java 17 + - sem-version java 21 # general settings - export PATH=${ANDROID_HOME}/emulator:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH} - sudo rm -rf ~/.rbenv ~/.phpbrew From 91f85b79a976425ce59f7353c3c4d3eceac5d074 Mon Sep 17 00:00:00 2001 From: denbond7 Date: Sun, 14 Sep 2025 16:28:43 +0300 Subject: [PATCH 5/5] Updated semaphore.yml to use Java 21(Updated comments) --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9b094e639..f80cd11f2 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -39,7 +39,7 @@ global_job_config: # print some debug info - ping fel.localhost -c 1 - ping fel.flowcrypt.test -c 1 - # use JAVA 17 by default + # use JAVA 21 by default - sem-version java 21 # general settings - export PATH=${ANDROID_HOME}/emulator:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}