Skip to content

Bump org.robolectric:robolectric from 4.14.1 to 4.16 #3103

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
FlowCryptRobot merged 7 commits into from
Sep 14, 2025
Merged

Bump org.robolectric:robolectric from 4.14.1 to 4.16 #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c22408
Bump org.robolectric:robolectric from 4.14.1 to 4.16
dependabot[bot] Sep 5, 2025
e76f3f0
Merge branch 'master' into dependabot/gradle/org.robolectric-robolect…
DenBond7 Sep 8, 2025
462ef4e
Merge branch 'master' into dependabot/gradle/org.robolectric-robolect…
DenBond7 Sep 14, 2025
98126dd
Modified build.gradle.kts to fix deprecated code.
DenBond7 Sep 14, 2025
31e34b5
Fixed compilation issue for roboelectric.
DenBond7 Sep 14, 2025
7ac13d0
Updated semaphore.yml to use Java 21
DenBond7 Sep 14, 2025
91f85b7
Updated semaphore.yml to use Java 21(Updated comments)
DenBond7 Sep 14, 2025
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 .idea/compiler.xml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ global_job_config:
# print some debug info
- ping fel.localhost -c 1
- ping fel.flowcrypt.test -c 1
# use JAVA 17 by default
- sem-version java 17
# 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}
- sudo rm -rf ~/.rbenv ~/.phpbrew
Expand Down
25 changes: 17 additions & 8 deletions FlowCrypt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,15 @@ android {

compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

buildFeatures {
buildConfig = true
viewBinding = true
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
}

packaging {
resources.excludes += setOf(
"META-INF/DEPENDENCIES",
Expand Down Expand Up @@ -328,6 +323,20 @@ 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 Expand Up @@ -436,7 +445,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")
Expand Down