From 6d7ad884680ca4752c47693cdcbbd0f3e0d3c389 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Sun, 9 Jul 2023 17:54:41 +0530 Subject: [PATCH] fix(deps): migrate to newer builder model dependencies --- gradle/libs.versions.toml | 8 ++++---- .../androidide/builder/model/DefaultAndroidArtifact.kt | 2 ++ .../androidide/builder/model/DefaultSourceProvider.kt | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 49ca35000..421069799 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.0.2" -agp-tooling = "7.4.2" +agp-tooling = "8.0.2" gradle-tooling = "8.1.1" kotlin = "1.8.21" tree-sitter = "3.1.0" @@ -84,10 +84,10 @@ google-java-format = { module ="com.google.googlejavaformat:google-java-format", google-flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" } # AAPT2 -aapt2-common = { module = "com.android.tools:common", version = "30.2.2" } -aapt2-annotations = { module = "com.android.tools:annotations", version = "30.2.2" } +aapt2-common = { module = "com.android.tools:common", version = "31.0.2" } +aapt2-annotations = { module = "com.android.tools:annotations", version = "31.0.2" } aapt2-jb-annotations = { module = "org.jetbrains:annotations", version = "24.0.1" } -aapt2-proto = { module = "com.android.tools.build:aapt2-proto", version = "7.2.2-7984345" } +aapt2-proto = { module = "com.android.tools.build:aapt2-proto", version = "8.0.2-9289358" } # XML xml-xercesImpl = { module = "xerces:xercesImpl", version = "2.12.2" } 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 9174c3c71..bed719a06 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 @@ -24,6 +24,7 @@ import java.io.Serializable /** @author Akash Yadav */ class DefaultAndroidArtifact : AndroidArtifact, Serializable { + private val serialVersionUID = 1L override var applicationId: String? = "" override var resGenTaskName: String? = null @@ -46,4 +47,5 @@ class DefaultAndroidArtifact : AndroidArtifact, Serializable { override var targetSdkVersionOverride: DefaultApiVersion? = null override var modelSyncFiles: Collection = emptyList() override var privacySandboxSdkInfo: PrivacySandboxSdkInfo? = null + override var desugaredMethodsFiles: Collection = emptyList() } diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt index 2ba0bd665..e7ad70bc2 100644 --- a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt +++ b/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt @@ -36,6 +36,7 @@ class DefaultSourceProvider() : SourceProvider, Serializable { override var resDirectories: Collection? = null override var resourcesDirectories: Collection = emptyList() override var shadersDirectories: Collection? = null + override var baselineProfileDirectories: Collection? = null companion object { @JvmStatic val NoFile = File("")