From cd96f10f5ca6c241d8ce8c5b2d471a2647e3db04 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Thu, 9 Nov 2023 09:51:55 +0530 Subject: [PATCH] fix(builder-model): migrate to latest APIs --- .../itsaky/androidide/builder/model/DefaultAndroidArtifact.kt | 1 + .../com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt | 2 ++ .../androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt | 3 +++ 3 files changed, 6 insertions(+) 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 index bed719a06..b7d5c64a3 100644 --- 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 @@ -48,4 +48,5 @@ class DefaultAndroidArtifact : AndroidArtifact, Serializable { override var modelSyncFiles: Collection = emptyList() override var privacySandboxSdkInfo: PrivacySandboxSdkInfo? = null override var desugaredMethodsFiles: Collection = emptyList() + override val generatedClassPaths: Map = emptyMap() } 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 index e4dfdf8e0..cc12b2fcd 100644 --- 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 @@ -22,6 +22,7 @@ import java.io.Serializable /** @author Akash Yadav */ class DefaultJavaArtifact : JavaArtifact, Serializable { + private val serialVersionUID = 1L override var modelSyncFiles: Collection = emptyList() @@ -32,4 +33,5 @@ class DefaultJavaArtifact : JavaArtifact, Serializable { override var ideSetupTaskNames: Set = emptySet() override var mockablePlatformJar: File? = null override var runtimeResourceFolder: File? = null + override val generatedClassPaths: Map = emptyMap() } diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt index c033da698..dd2eab267 100644 --- a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt +++ b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt @@ -65,6 +65,9 @@ class AndroidProjectModelBuilder(initializationParams: InitializeProjectParams) ModelBuilderParameter::class.java) { it.variantName = configurationVariant it.dontBuildRuntimeClasspath = false + it.dontBuildAndroidTestRuntimeClasspath = true + it.dontBuildTestFixtureRuntimeClasspath = true + it.dontBuildUnitTestRuntimeClasspath = true } controller.findModel(module, ProjectSyncIssues::class.java)?.also { syncIssues ->