diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index cf0bdd13d..fd17654f5 100644 Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ diff --git a/lsp/java/build.gradle.kts b/lsp/java/build.gradle.kts index 6326c9138..86d9df3ef 100644 --- a/lsp/java/build.gradle.kts +++ b/lsp/java/build.gradle.kts @@ -22,15 +22,6 @@ plugins { android { namespace = "com.itsaky.androidide.lsp.java" - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = "1.8" - } } kapt { diff --git a/subprojects/google-java-format/build.gradle.kts b/subprojects/google-java-format/build.gradle.kts index bea1b1e0a..dbd68db8b 100644 --- a/subprojects/google-java-format/build.gradle.kts +++ b/subprojects/google-java-format/build.gradle.kts @@ -20,11 +20,6 @@ plugins { id("java-library") } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { implementation(libs.google.guava.jre) implementation(libs.google.auto.value.annotations) diff --git a/subprojects/javac-services/build.gradle.kts b/subprojects/javac-services/build.gradle.kts index 8e6ff692f..3a36a1578 100644 --- a/subprojects/javac-services/build.gradle.kts +++ b/subprojects/javac-services/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { id("com.android.library") id("kotlin-android") @@ -13,16 +11,6 @@ android { isMinifyEnabled = false } } - - // Must be set to Java 8 - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} - -tasks.withType { - kotlinOptions.jvmTarget = "1.8" } dependencies { diff --git a/subprojects/javac/build.gradle.kts b/subprojects/javac/build.gradle.kts index 4f632ced3..91b1ad9f6 100644 --- a/subprojects/javac/build.gradle.kts +++ b/subprojects/javac/build.gradle.kts @@ -20,11 +20,6 @@ plugins { id("java-library") } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - configurations.all { resolutionStrategy { cacheChangingModulesFor(0, "seconds") diff --git a/subprojects/jdk-compiler/build.gradle.kts b/subprojects/jdk-compiler/build.gradle.kts index 226f55629..36dc357b9 100644 --- a/subprojects/jdk-compiler/build.gradle.kts +++ b/subprojects/jdk-compiler/build.gradle.kts @@ -28,8 +28,6 @@ apply { java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 - - } dependencies { diff --git a/subprojects/jdk-jdeps/build.gradle.kts b/subprojects/jdk-jdeps/build.gradle.kts index 040119650..149110764 100644 --- a/subprojects/jdk-jdeps/build.gradle.kts +++ b/subprojects/jdk-jdeps/build.gradle.kts @@ -25,11 +25,6 @@ apply { plugin(PropertiesParserPlugin::class) } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api(projects.subprojects.javaCompiler) api(projects.subprojects.jdkCompiler)