Skip to content

Commit 15c6e0e

Browse files
Bump org.robolectric:robolectric from 4.14.1 to 4.16 (#3103)
* 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](robolectric/robolectric@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] <support@github.com> * Modified build.gradle.kts to fix deprecated code. * Fixed compilation issue for roboelectric. * Updated semaphore.yml to use Java 21 * Updated semaphore.yml to use Java 21(Updated comments) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Den <DenBond7@gmail.com>
1 parent 1758f90 commit 15c6e0e

3 files changed

Lines changed: 20 additions & 11 deletions

File tree

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.semaphore/semaphore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ global_job_config:
3939
# print some debug info
4040
- ping fel.localhost -c 1
4141
- ping fel.flowcrypt.test -c 1
42-
# use JAVA 17 by default
43-
- sem-version java 17
42+
# use JAVA 21 by default
43+
- sem-version java 21
4444
# general settings
4545
- export PATH=${ANDROID_HOME}/emulator:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}
4646
- sudo rm -rf ~/.rbenv ~/.phpbrew

FlowCrypt/build.gradle.kts

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,15 @@ android {
184184

185185
compileOptions {
186186
isCoreLibraryDesugaringEnabled = true
187-
sourceCompatibility = JavaVersion.VERSION_17
188-
targetCompatibility = JavaVersion.VERSION_17
187+
sourceCompatibility = JavaVersion.VERSION_21
188+
targetCompatibility = JavaVersion.VERSION_21
189189
}
190190

191191
buildFeatures {
192192
buildConfig = true
193193
viewBinding = true
194194
}
195195

196-
kotlinOptions {
197-
jvmTarget = JavaVersion.VERSION_17.toString()
198-
freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
199-
}
200-
201196
packaging {
202197
resources.excludes += setOf(
203198
"META-INF/DEPENDENCIES",
@@ -328,6 +323,20 @@ easylauncher {
328323
}
329324
}
330325

326+
java {
327+
toolchain {
328+
languageVersion.set(JavaLanguageVersion.of(21))
329+
}
330+
}
331+
332+
333+
kotlin {
334+
compilerOptions {
335+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
336+
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
337+
}
338+
}
339+
331340
tasks.register("checkCorrectBranch") {
332341
if (!grgit.branch.current().name.equals("master")) {
333342
throw GradleException("Please use 'master' branch to generate a release build")
@@ -436,7 +445,7 @@ dependencies {
436445
testImplementation("com.squareup.okhttp3:mockwebserver:5.1.0")
437446
testImplementation("com.flextrade.jfixture:jfixture:2.7.2")
438447
testImplementation("com.shazam:shazamcrest:0.11")
439-
testImplementation("org.robolectric:robolectric:4.14.1")
448+
testImplementation("org.robolectric:robolectric:4.16")
440449
//we need it to test Parcelable implementation
441450
testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.2.10")
442451
testImplementation("junit:junit:4.13.2")

0 commit comments

Comments
 (0)