diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 345de96f6..36b3b620c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.3.2"
-agp-tooling = "8.4.1"
+agp = "8.5.0"
+agp-tooling = "8.5.0"
 gradle-tooling = "8.6"
 junit-jupiter = "5.10.2"
 kotlin = "1.9.22"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 100755
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4..a4413138c 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-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt
index 7fd08d1f2..b9828da08 100644
--- a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt
+++ b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt
@@ -38,7 +38,7 @@ internal val Project.isTestEnv: Boolean
     _PROPERTY_IS_TEST_ENV).toString().toBoolean()
 
 internal fun depVersion(testEnv: Boolean): String {
-  return if (testEnv && !System.getenv("CI").toBoolean()) {
+  return if (testEnv  ) {
     BuildInfo.VERSION_NAME_SIMPLE
   } else {
     BuildInfo.VERSION_NAME_DOWNLOAD
@@ -49,6 +49,6 @@ fun Project.ideDependency(group: String, artifact: String): Dependency {
   return dependencies.ideDependency(group, artifact, isTestEnv)
 }
 
-fun DependencyHandler.ideDependency(group: String, artifact: String, testEnv: Boolean): Dependency {
+fun DependencyHandler.  ideDependency(group: String, artifact: String, testEnv: Boolean): Dependency {
   return create("${BuildInfo.MVN_GROUP_ID}.${group}:${artifact}:${depVersion(testEnv)}")
 }
diff --git a/utilities/build-info/build.gradle.kts b/utilities/build-info/build.gradle.kts
index 0e1751ef1..4e6d0077b 100644
--- a/utilities/build-info/build.gradle.kts
+++ b/utilities/build-info/build.gradle.kts
@@ -35,8 +35,6 @@ plugins {
   id("com.vanniktech.maven.publish.base")
 }
 
-
-
 description = "Information about the AndroidIDE build"
 
 val buildInfoGenDir: Provider<Directory> = project.layout.buildDirectory.dir("generated/buildInfo")