Skip to content

Commit

Permalink
Bump JVM version to 11
Browse files Browse the repository at this point in the history
  • Loading branch information
Ifropc committed Oct 24, 2023
1 parent cd9b953 commit 5f7c76d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

apply(plugin = "base")

val jvmVersion = JavaVersion.VERSION_1_8
val jvmVersion = JavaVersion.VERSION_11

allprojects {
group = "org.stellar.wallet-sdk"
Expand Down Expand Up @@ -76,6 +76,7 @@ subprojects {
}

compileTestKotlin {
kotlinOptions.jvmTarget = jvmVersion.toString()
compilerOptions {
freeCompilerArgs.add("-opt-in=kotlin.io.encoding.ExperimentalEncodingApi")
}
Expand Down
6 changes: 6 additions & 0 deletions wallet-sdk/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

// The alias call in plugins scope produces IntelliJ false error which is suppressed here.
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
Expand Down Expand Up @@ -63,6 +65,10 @@ val testIntegration by
mustRunAfter(tasks.test)
}

tasks.getByName("compileTestIntegrationKotlin") {
(this as KotlinCompile).kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
}

tasks.check.get().dependsOn += testIntegration

val dokkaOutputDir = buildDir.resolve("dokka")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ class RecoveryTest {
@Test
@Order(5)
@DisplayName("1.5 - Add Device Keypair As Signer And Remove Master Keypair As Signer")
fun addDeviceKeyPairAsSigner() = runTest {
addDeviceRemoveMaster()
}
fun addDeviceKeyPairAsSigner() = runTest { addDeviceRemoveMaster() }

private suspend fun addDeviceRemoveMaster() {
val tx: Transaction =
Expand Down

0 comments on commit 5f7c76d

Please sign in to comment.