fix: add support for AGP 8.3.0 (#1744)

itsaky · itsaky · commit d5762bddb849 · 2024-03-02T18:53:50.000+05:30
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.2.2"
-agp-tooling = "8.2.2"
+agp = "8.3.0"
+agp-tooling = "8.3.0"
 gradle-tooling = "8.6"
 junit-jupiter = "5.10.2"
 kotlin = "1.9.22"
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt
@@ -17,6 +17,7 @@
 package com.itsaky.androidide.builder.model
 
 import com.android.builder.model.v2.ide.AndroidArtifact
+import com.android.builder.model.v2.ide.BytecodeTransformation
 import com.android.builder.model.v2.ide.CodeShrinker
 import com.android.builder.model.v2.ide.PrivacySandboxSdkInfo
 import java.io.File
@@ -45,8 +46,9 @@ class DefaultAndroidArtifact : AndroidArtifact, Serializable {
   override var generatedSourceFolders: Collection<File> = emptyList()
   override var ideSetupTaskNames: Set<String> = emptySet()
   override var targetSdkVersionOverride: DefaultApiVersion? = null
-  override var modelSyncFiles: Collection<DefaultModelSyncFile> = emptyList()
+  override var modelSyncFiles: Collection<Void> = emptyList()
   override var privacySandboxSdkInfo: PrivacySandboxSdkInfo? = null
   override var desugaredMethodsFiles: Collection<File> = emptyList()
   override val generatedClassPaths: Map<String, File> = emptyMap()
+  override val bytecodeTransformations: Collection<BytecodeTransformation> = emptyList()
 }
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt
@@ -16,6 +16,7 @@
  */
 package com.itsaky.androidide.builder.model
 
+import com.android.builder.model.v2.ide.BytecodeTransformation
 import com.android.builder.model.v2.ide.JavaArtifact
 import java.io.File
 import java.io.Serializable
@@ -24,7 +25,7 @@ import java.io.Serializable
 class DefaultJavaArtifact : JavaArtifact, Serializable {
 
   private val serialVersionUID = 1L
-  override var modelSyncFiles: Collection<DefaultModelSyncFile> = emptyList()
+  override var modelSyncFiles: Collection<Void> = emptyList()
 
   override var assembleTaskName: String = ""
   override var classesFolders: Set<File> = emptySet()
@@ -34,4 +35,5 @@ class DefaultJavaArtifact : JavaArtifact, Serializable {
   override var mockablePlatformJar: File? = null
   override var runtimeResourceFolder: File? = null
   override val generatedClassPaths: Map<String, File> = emptyMap()
+  override val bytecodeTransformations: Collection<BytecodeTransformation> = emptyList()
 }
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultModelSyncFile.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultModelSyncFile.kt
diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt
@@ -32,4 +32,5 @@ class DefaultVariant : Variant, Serializable {
   override var testFixturesArtifact: DefaultAndroidArtifact? = null
   override var testedTargetVariant: DefaultTestedTargetVariant? = null
   override var unitTestArtifact: DefaultJavaArtifact? = null
+  override val runTestInSeparateProcess: Boolean = false
 }
diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt b/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt
@@ -27,7 +27,6 @@ import com.android.builder.model.v2.ide.ProjectType
 import com.itsaky.androidide.builder.model.DefaultAndroidGradlePluginProjectFlags
 import com.itsaky.androidide.builder.model.DefaultJavaCompileOptions
 import com.itsaky.androidide.builder.model.DefaultLibrary
-import com.itsaky.androidide.builder.model.DefaultModelSyncFile
 import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
 import com.itsaky.androidide.builder.model.DefaultViewBindingOptions
 import com.itsaky.androidide.builder.model.UNKNOWN_PACKAGE
@@ -107,7 +106,6 @@ open class AndroidModule( // Class must be open because BaseXMLTest mocks this..
   val libraries: Set<String>,
   val libraryMap: Map<String, DefaultLibrary>,
   val lintCheckJars: List<File>,
-  val modelSyncFiles: List<DefaultModelSyncFile>,
   val variants: List<BasicAndroidVariantMetadata> = listOf(),
   val configuredVariant: BasicAndroidVariantMetadata?,
   val classesJar: File?
diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt b/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt
@@ -112,7 +112,6 @@ class ProjectTransformer {
       libraries = libraryMap.keys,
       libraryMap = libraryMap,
       lintCheckJars = project.getLintCheckJars().get(),
-      modelSyncFiles = project.getModelSyncFiles().get(),
       variants = variants,
       configuredVariant = variants.find { it.name == configuredVariant },
       classesJar = metadata.classesJar
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
@@ -29,11 +29,8 @@ import com.android.builder.model.v2.models.BasicAndroidProject
 import com.android.builder.model.v2.models.VariantDependencies
 import com.android.builder.model.v2.models.Versions
 import com.itsaky.androidide.builder.model.DefaultLibrary
-import com.itsaky.androidide.builder.model.DefaultModelSyncFile
-import com.itsaky.androidide.builder.model.DefaultSourceProvider
 import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
 import com.itsaky.androidide.builder.model.DefaultViewBindingOptions
-import com.itsaky.androidide.builder.model.UNKNOWN_PACKAGE
 import com.itsaky.androidide.tooling.api.IAndroidProject
 import com.itsaky.androidide.tooling.api.models.AndroidArtifactMetadata
 import com.itsaky.androidide.tooling.api.models.AndroidProjectMetadata
@@ -43,7 +40,6 @@ import com.itsaky.androidide.tooling.api.models.ProjectMetadata
 import com.itsaky.androidide.tooling.api.models.params.StringParameter
 import com.itsaky.androidide.tooling.api.util.AndroidModulePropertyCopier
 import com.itsaky.androidide.tooling.api.util.AndroidModulePropertyCopier.copy
-import com.itsaky.androidide.tooling.api.util.extractPackageName
 import com.itsaky.androidide.utils.AndroidPluginVersion
 import com.itsaky.androidide.utils.capitalizeString
 import org.gradle.tooling.model.GradleProject
@@ -146,17 +142,6 @@ internal class AndroidProjectImpl(
     return CompletableFuture.supplyAsync { androidProject.lintChecksJars }
   }
 
-  override fun getModelSyncFiles(): CompletableFuture<List<DefaultModelSyncFile>> {
-    return CompletableFuture.supplyAsync {
-
-      // model sync files available only in v7.3.0 and later
-      return@supplyAsync if (AndroidPluginVersion.parse(versions.agp) >= AndroidPluginVersion(7, 3,
-          0)
-      ) copy(androidProject.modelSyncFiles)
-      else emptyList()
-    }
-  }
-
   private fun getClassesJar(): File {
     // TODO(itsaky): this should handle product flavors as well
     return File(gradleProject.buildDirectory,
diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt
@@ -18,7 +18,6 @@
 package com.itsaky.androidide.tooling.impl.internal.forwarding
 
 import com.itsaky.androidide.builder.model.DefaultLibrary
-import com.itsaky.androidide.builder.model.DefaultModelSyncFile
 import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
 import com.itsaky.androidide.tooling.api.IAndroidProject
 import com.itsaky.androidide.tooling.api.IGradleProject
@@ -93,11 +92,6 @@ internal class ForwardingProject(var project: IGradleProject? = null) : IGradleP
       UnsupportedOperationException())
   }
 
-  override fun getModelSyncFiles(): CompletableFuture<List<DefaultModelSyncFile>> {
-    return this.androidProject?.getModelSyncFiles() ?: CompletableFuture.failedFuture(
-      UnsupportedOperationException())
-  }
-
   override fun getClasspaths(): CompletableFuture<List<File>> {
     return this.javaProject?.getClasspaths() ?: CompletableFuture.failedFuture(
       UnsupportedOperationException())
diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt b/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt
@@ -18,7 +18,6 @@
 package com.itsaky.androidide.tooling.api
 
 import com.itsaky.androidide.builder.model.DefaultLibrary
-import com.itsaky.androidide.builder.model.DefaultModelSyncFile
 import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
 import com.itsaky.androidide.tooling.api.models.AndroidVariantMetadata
 import com.itsaky.androidide.tooling.api.models.BasicAndroidVariantMetadata
@@ -83,13 +82,6 @@ interface IAndroidProject : IModuleProject {
   @JsonRequest
   fun getLintCheckJars(): CompletableFuture<List<File>>
 
-  /**
-   * Get the list of [DefaultModelSyncFile]s for this project.
-   * See [ModelSyncFile][com.android.builder.model.v2.ModelSyncFile] for more details.
-   */
-  @JsonRequest
-  fun getModelSyncFiles(): CompletableFuture<List<DefaultModelSyncFile>>
-
   @Suppress("unused")
   companion object {
 
diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt b/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt
@@ -18,53 +18,37 @@
 package com.itsaky.androidide.tooling.api.util
 
 import com.android.builder.model.v2.CustomSourceDirectory
-import com.android.builder.model.v2.ModelSyncFile
-import com.android.builder.model.v2.ide.AndroidArtifact
 import com.android.builder.model.v2.ide.AndroidGradlePluginProjectFlags
 import com.android.builder.model.v2.ide.AndroidGradlePluginProjectFlags.BooleanFlag
 import com.android.builder.model.v2.ide.AndroidLibraryData
 import com.android.builder.model.v2.ide.ApiVersion
 import com.android.builder.model.v2.ide.ArtifactDependencies
-import com.android.builder.model.v2.ide.BundleInfo
 import com.android.builder.model.v2.ide.GraphItem
-import com.android.builder.model.v2.ide.JavaArtifact
 import com.android.builder.model.v2.ide.JavaCompileOptions
 import com.android.builder.model.v2.ide.Library
 import com.android.builder.model.v2.ide.LibraryInfo
 import com.android.builder.model.v2.ide.ProjectInfo
 import com.android.builder.model.v2.ide.SourceProvider
 import com.android.builder.model.v2.ide.SourceSetContainer
 import com.android.builder.model.v2.ide.SyncIssue
-import com.android.builder.model.v2.ide.TestInfo
-import com.android.builder.model.v2.ide.TestedTargetVariant
 import com.android.builder.model.v2.ide.UnresolvedDependency
-import com.android.builder.model.v2.ide.Variant
 import com.android.builder.model.v2.ide.ViewBindingOptions
 import com.android.builder.model.v2.models.ProjectSyncIssues
-import com.android.builder.model.v2.models.VariantDependencies
-import com.itsaky.androidide.builder.model.DefaultAndroidArtifact
 import com.itsaky.androidide.builder.model.DefaultAndroidGradlePluginProjectFlags
 import com.itsaky.androidide.builder.model.DefaultAndroidLibraryData
 import com.itsaky.androidide.builder.model.DefaultApiVersion
 import com.itsaky.androidide.builder.model.DefaultArtifactDependencies
-import com.itsaky.androidide.builder.model.DefaultBundleInfo
 import com.itsaky.androidide.builder.model.DefaultCustomSourceDirectory
 import com.itsaky.androidide.builder.model.DefaultGraphItem
-import com.itsaky.androidide.builder.model.DefaultJavaArtifact
 import com.itsaky.androidide.builder.model.DefaultJavaCompileOptions
 import com.itsaky.androidide.builder.model.DefaultLibrary
 import com.itsaky.androidide.builder.model.DefaultLibraryInfo
-import com.itsaky.androidide.builder.model.DefaultModelSyncFile
 import com.itsaky.androidide.builder.model.DefaultProjectInfo
 import com.itsaky.androidide.builder.model.DefaultProjectSyncIssues
 import com.itsaky.androidide.builder.model.DefaultSourceProvider
 import com.itsaky.androidide.builder.model.DefaultSourceSetContainer
 import com.itsaky.androidide.builder.model.DefaultSyncIssue
-import com.itsaky.androidide.builder.model.DefaultTestInfo
-import com.itsaky.androidide.builder.model.DefaultTestedTargetVariant
 import com.itsaky.androidide.builder.model.DefaultUnresolvedDependency
-import com.itsaky.androidide.builder.model.DefaultVariant
-import com.itsaky.androidide.builder.model.DefaultVariantDependencies
 import com.itsaky.androidide.builder.model.DefaultViewBindingOptions
 import com.itsaky.androidide.utils.ILogger
 
@@ -88,23 +72,6 @@ object AndroidModulePropertyCopier {
     }
   }
 
-  @JvmName("copyModelSyncFiles")
-  fun copy(modelSyncFiles: Collection<ModelSyncFile>): List<DefaultModelSyncFile> {
-    val new = mutableListOf<DefaultModelSyncFile>()
-    for (file in modelSyncFiles) {
-      new.add(copy(file))
-    }
-
-    return new
-  }
-
-  fun copy(file: ModelSyncFile): DefaultModelSyncFile =
-    DefaultModelSyncFile().apply {
-      modelSyncType = file.modelSyncType
-      syncFile = file.syncFile
-      taskName = file.taskName
-    }
-
   fun copy(version: ApiVersion?): DefaultApiVersion? =
     if (version == null) null
     else
@@ -306,5 +273,6 @@ object AndroidModulePropertyCopier {
   }
 
   fun copy(issue: SyncIssue) =
-    DefaultSyncIssue(issue.data, issue.message, issue.multiLineMessage?.toTypedArray()?.let { listOf(*it) }, issue.severity, issue.type)
+    DefaultSyncIssue(issue.data, issue.message,
+      issue.multiLineMessage?.toTypedArray()?.let { listOf(*it) }, issue.severity, issue.type)
 }

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,5 @@ class DefaultVariant : Variant, Serializable {`
`32`	`32`	`override var testFixturesArtifact: DefaultAndroidArtifact? = null`
`33`	`33`	`override var testedTargetVariant: DefaultTestedTargetVariant? = null`
`34`	`34`	`override var unitTestArtifact: DefaultJavaArtifact? = null`
	`35`	`+ override val runTestInSeparateProcess: Boolean = false`
`35`	`36`	`}`