Update files after changes to new gradle setup
Bug: b/270105162
Change-Id: I363b2c9d933739501a50bfc1bea56390d7130200
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 14b417a..b8569b1 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -88,8 +88,7 @@
val projectAndTaskName = "${project.name}-$name"
val downloadTaskName = "download-third-party-$projectAndTaskName-${tpd.packageName}"
val downloadTask = tasks.register<DownloadDependencyTask>(downloadTaskName) {
- setDependency(
- getRoot(), getRoot().resolve(tpd.sha1File), getRoot().resolve(tpd.path), tpd.type)
+ setDependency(getRoot().resolve(tpd.sha1File), getRoot().resolve(tpd.path), tpd.type)
}.get()
outputFiles.add(tpd.path)
downloadTask
@@ -300,6 +299,7 @@
val asm by lazy { "org.ow2.asm:asm:${Versions.asmVersion}" }
val asmUtil by lazy { "org.ow2.asm:asm-util:${Versions.asmVersion}" }
val asmCommons by lazy { "org.ow2.asm:asm-commons:${Versions.asmVersion}" }
+ val errorprone by lazy { "com.google.errorprone:error_prone_core:${Versions.errorproneVersion}" }
val fastUtil by lazy { "it.unimi.dsi:fastutil:${Versions.fastUtilVersion}"}
val gson by lazy { "com.google.code.gson:gson:${Versions.gsonVersion}"}
val guava by lazy { "com.google.guava:guava:${Versions.guavaVersion}" }
@@ -311,7 +311,6 @@
val kotlinReflect by lazy { "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlinVersion}" }
val mockito by lazy { "org.mockito:mockito-core:${Versions.mockito}" }
val smali by lazy { "com.android.tools.smali:smali:${Versions.smaliVersion}" }
- val errorprone by lazy { "com.google.errorprone:error_prone_core:${Versions.errorproneVersion}" }
}
object ThirdPartyDeps {
@@ -501,7 +500,7 @@
fun getThirdPartyAndroidVms() : List<ThirdPartyDependency> {
return listOf(
listOf("host", "art-master"),
- listOf("host", "art-14.0.0-dp1"),
+ listOf("host", "art-14.0.0-beta3"),
listOf("host", "art-13.0.0"),
listOf("host", "art-12.0.0-beta4"),
listOf("art-10.0.0"),
diff --git a/d8_r8/resourceshrinker/build.gradle.kts b/d8_r8/resourceshrinker/build.gradle.kts
index e4cda0c..22c85cd 100644
--- a/d8_r8/resourceshrinker/build.gradle.kts
+++ b/d8_r8/resourceshrinker/build.gradle.kts
@@ -28,8 +28,24 @@
})
}
+val thirdPartyCompileDependenciesTask = ensureThirdPartyDependencies(
+ "compileDeps",
+ listOf(ThirdPartyDeps.r8))
+
+dependencies {
+ compileOnly(Deps.asm)
+ compileOnly(Deps.guava)
+ compileOnly(files(getRoot().resolve(ThirdPartyDeps.r8.path).resolve("r8lib_8.2.20-dev.jar")))
+ implementation("com.android.tools.build:aapt2-proto:8.2.0-alpha10-10154469")
+ implementation("com.google.protobuf:protobuf-java:3.19.3")
+ implementation("com.android.tools.layoutlib:layoutlib-api:31.2.0-alpha10")
+ implementation("com.android.tools:common:31.2.0-alpha10")
+ implementation("com.android.tools:sdk-common:31.2.0-alpha10")
+}
+
tasks {
withType<KotlinCompile> {
+ dependsOn(thirdPartyCompileDependenciesTask)
kotlinOptions {
// We cannot use languageVersion.set(JavaLanguageVersion.of(8)) because gradle cannot figure
// out that the jdk is 1_8 and will try to download it.
@@ -47,14 +63,3 @@
archiveFileName.set("resourceshrinker_deps.jar")
}
}
-
-dependencies {
- compileOnly(Deps.asm)
- compileOnly(Deps.guava)
- compileOnly(files(getRoot().resolve("third_party/r8/r8lib_8.2.20-dev.jar")))
- implementation("com.android.tools.build:aapt2-proto:8.2.0-alpha10-10154469")
- implementation("com.google.protobuf:protobuf-java:3.19.3")
- implementation("com.android.tools.layoutlib:layoutlib-api:31.2.0-alpha10")
- implementation("com.android.tools:common:31.2.0-alpha10")
- implementation("com.android.tools:sdk-common:31.2.0-alpha10")
-}
diff --git a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1 b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
index 94616ba..eef5dd3 100644
--- a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
+++ b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
@@ -1 +1 @@
-13ccbabcc23194ef50c8c3331bf4ef7cee364b75
\ No newline at end of file
+89d6c85fd0555dbba34cf3f1f3176cf1fd05d34f
\ No newline at end of file
