diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56e..61a9130c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index f1aa5e24..5700ddb6 100644 --- a/build.gradle +++ b/build.gradle @@ -66,6 +66,16 @@ subprojects { toggleOffOn() } } + + // From Gradle 8 onwards, Kapt no longer automatically picks up jvmTarget + // from normal KotlinOptions. Must be manually set. + // JvmToolchain should not be used since it changes the actual JDK used. + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs).configureEach { + kotlinOptions { + jvmTarget = java_version + } + } + } task clean(type: Delete) { diff --git a/deps.gradle b/deps.gradle index 6307b83d..d590e8e6 100644 --- a/deps.gradle +++ b/deps.gradle @@ -3,7 +3,7 @@ ext { compose_version = '1.2.1' compose_compiler_version = '1.4.5' kotlin_version = '1.8.20' - java_version = JavaVersion.VERSION_17 + java_version = JavaVersion.VERSION_1_8 dokka_version = '1.5.0' androidSdk = [ compileVersion: 33, diff --git a/livekit-lint/build.gradle b/livekit-lint/build.gradle index f55993d5..98911e59 100644 --- a/livekit-lint/build.gradle +++ b/livekit-lint/build.gradle @@ -8,6 +8,11 @@ java { sourceCompatibility = java_version targetCompatibility = java_version } +compileKotlin { + kotlinOptions { + jvmTarget = java_version + } +} dependencies {