From 999baab1003127d316cb094ec9d9f001629c911e Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Fri, 10 Nov 2023 00:13:00 +0530 Subject: [PATCH] fix(tooling-api): use AndroidPluginVersion for comparing AGP version in AndroidProjectImpl (fixes #1440) --- changelogs/v2.6.1-beta.md | 2 +- .../androidide/tooling/impl/internal/AndroidProjectImpl.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelogs/v2.6.1-beta.md b/changelogs/v2.6.1-beta.md index b4788657a..8fcc5fa67 100644 --- a/changelogs/v2.6.1-beta.md +++ b/changelogs/v2.6.1-beta.md @@ -16,7 +16,7 @@ _No additions_ ## Bug fixes -_No bug fixes_ +- Tooling API fails when working with preview versions of AGP (#1440). ## Improvements diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt index c9c7c15dc..739a954ac 100644 --- a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt +++ b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt @@ -42,6 +42,7 @@ import com.itsaky.androidide.tooling.api.util.AndroidModulePropertyCopier import com.itsaky.androidide.tooling.api.util.AndroidModulePropertyCopier.copy import com.itsaky.androidide.tooling.api.util.compareSemanticVersions import com.itsaky.androidide.tooling.api.util.extractPackageName +import com.itsaky.androidide.utils.AndroidPluginVersion import org.gradle.tooling.model.GradleProject import java.io.File import java.io.Serializable @@ -163,7 +164,7 @@ internal class AndroidProjectImpl( return CompletableFuture.supplyAsync { // model sync files available only in v7.3.0 and later - return@supplyAsync if (compareSemanticVersions(versions.agp, "7.3.0") >= 0) + return@supplyAsync if (AndroidPluginVersion.parse(versions.agp) >= AndroidPluginVersion(7, 3, 0)) copy(androidProject.modelSyncFiles) else emptyList() }