Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): migrate to newer builder model dependencies

Browse Source
This commit is contained in:
Akash Yadav
2023-07-09 17:54:41 +05:30
parent 314475ee23
commit 6d7ad88468
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/libs.versions.toml
+4 -4
View File
@@ -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" }
subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt
+2
View File
@@ -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<DefaultModelSyncFile> = emptyList()
override var privacySandboxSdkInfo: PrivacySandboxSdkInfo? = null
override var desugaredMethodsFiles: Collection<File> = emptyList()
}
subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt
+1
View File
@@ -36,6 +36,7 @@ class DefaultSourceProvider() : SourceProvider, Serializable {
override var resDirectories: Collection<File>? = null
override var resourcesDirectories: Collection<File> = emptyList()
override var shadersDirectories: Collection<File>? = null
override var baselineProfileDirectories: Collection<File>? = null
companion object {
@JvmStatic val NoFile = File("<does-not-exist>")