diff --git a/annotation-ksp/build.gradle.kts b/annotation-ksp/build.gradle.kts
index 11cd8d257..fee181ebb 100644
--- a/annotation-ksp/build.gradle.kts
+++ b/annotation-ksp/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /*
  *  This file is part of AndroidIDE.
  *
@@ -19,7 +21,6 @@ plugins {
   kotlin("jvm")
 }
 
-
 group = "com.itsaky.androidide.annotations"
 
 dependencies {
@@ -34,4 +35,8 @@ dependencies {
 
 sourceSets.main {
   java.srcDirs("src/main/kotlin")
+}
+
+tasks.withType<KotlinCompile> {
+  kotlinOptions.jvmTarget = "17"
 }
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index eaf36c511..064ed2486 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -185,3 +185,8 @@ fun getEnvOrProp(key: String): String? {
   }
   return value
 }
+
+afterEvaluate {
+  tasks.getByName("mergeDebugAssets").dependsOn(":subprojects:tooling-api-impl:copyJarToAssets")
+  tasks.getByName("mergeReleaseAssets").dependsOn(":subprojects:tooling-api-impl:copyJarToAssets")
+}
\ No newline at end of file
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 fd17654f5..47f52d2d9 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/build-logic/ide/build.gradle.kts b/build-logic/ide/build.gradle.kts
index 3bb838291..5949e57ed 100644
--- a/build-logic/ide/build.gradle.kts
+++ b/build-logic/ide/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /*
  *  This file is part of AndroidIDE.
  *
@@ -25,6 +27,15 @@ repositories {
   mavenCentral()
 }
 
+java {
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType<KotlinCompile> {
+  kotlinOptions.jvmTarget = "17"
+}
+
 dependencies {
   implementation(gradleApi())
   implementation(libs.common.jkotlin)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4..42defcc94 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists