Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit 0abaeca

Browse files
committed
fix(tooling-api): add support for AGP 8.4.*
1 parent 9fc7999 commit 0abaeca

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
agp = "8.3.0"
3-
agp-tooling = "8.3.0"
3+
agp-tooling = "8.4.0-rc02"
44
gradle-tooling = "8.6"
55
junit-jupiter = "5.10.2"
66
kotlin = "1.9.22"

subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@
1616
*/
1717
package com.itsaky.androidide.builder.model
1818

19+
import com.android.builder.model.v2.ide.SourceProvider
1920
import com.android.builder.model.v2.ide.SourceSetContainer
2021
import java.io.Serializable
2122

2223
/** @author Akash Yadav */
2324
class DefaultSourceSetContainer : SourceSetContainer, Serializable {
25+
2426
private val serialVersionUID = 1L
27+
@Deprecated("Contained in deviceTestSourceProviders")
2528
override var androidTestSourceProvider: DefaultSourceProvider? = null
2629
override var sourceProvider: DefaultSourceProvider = DefaultSourceProvider()
2730
override var testFixturesSourceProvider: DefaultSourceProvider? = null
31+
@Deprecated("Contained in hostTestSourceProviders")
2832
override var unitTestSourceProvider: DefaultSourceProvider? = null
33+
override val deviceTestSourceProviders: Map<String, SourceProvider> = emptyMap()
34+
override val hostTestSourceProviders: Map<String, SourceProvider> = emptyMap()
2935
}

subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
*/
1717
package com.itsaky.androidide.builder.model
1818

19+
import com.android.builder.model.v2.ide.AndroidArtifact
20+
import com.android.builder.model.v2.ide.JavaArtifact
1921
import com.android.builder.model.v2.ide.Variant
2022
import java.io.File
2123
import java.io.Serializable
2224

2325
/** @author Akash Yadav */
2426
class DefaultVariant : Variant, Serializable {
27+
2528
private val serialVersionUID = 1L
29+
@Deprecated("Contained in deviceTestArtifacts")
2630
override var androidTestArtifact: DefaultAndroidArtifact? = null
2731
override var displayName: String = ""
2832
override var isInstantAppCompatible: Boolean = false
@@ -31,6 +35,9 @@ class DefaultVariant : Variant, Serializable {
3135
override var name: String = ""
3236
override var testFixturesArtifact: DefaultAndroidArtifact? = null
3337
override var testedTargetVariant: DefaultTestedTargetVariant? = null
38+
@Deprecated("Contained in hostTestArtifacts")
3439
override var unitTestArtifact: DefaultJavaArtifact? = null
3540
override val runTestInSeparateProcess: Boolean = false
41+
override val deviceTestArtifacts: Map<String, AndroidArtifact> = emptyMap()
42+
override val hostTestArtifacts: Map<String, JavaArtifact> = emptyMap()
3643
}

subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@
1616
*/
1717
package com.itsaky.androidide.builder.model
1818

19+
import com.android.builder.model.v2.ide.ArtifactDependencies
1920
import com.android.builder.model.v2.models.VariantDependencies
2021
import java.io.Serializable
2122

2223
/** @author Akash Yadav */
2324
class DefaultVariantDependencies : VariantDependencies, Serializable {
25+
2426
private val serialVersionUID = 1L
27+
@Deprecated("Contained in deviceTestArtifacts")
2528
override var androidTestArtifact: DefaultArtifactDependencies? = null
2629
override var libraries: Map<String, DefaultLibrary> = emptyMap()
2730
override var mainArtifact: DefaultArtifactDependencies = DefaultArtifactDependencies()
2831
override var name: String = ""
2932
override var testFixturesArtifact: DefaultArtifactDependencies? = null
33+
@Deprecated("Contained in hostTestArtifacts")
3034
override var unitTestArtifact: DefaultArtifactDependencies? = null
35+
override val deviceTestArtifacts: Map<String, ArtifactDependencies> = emptyMap()
36+
override val hostTestArtifacts: Map<String, ArtifactDependencies> = emptyMap()
3137
}

0 commit comments

Comments
 (0)