Move away from caching configurations in buildSrc/shared.gradle
AndroidX has special code to serialize/deserialize configurations in
buildSrc/shared.gradle. We had cacheableImplementation/cacheableApi
extending implementation/api. However, because we resolve down to jars
for cacheableImplementation and cacheableApi separately and put those
jars on the two classpaths, it can lead to issues where a dependency
version is bumped under a library. This is exactly what happens when
trying to update wire plugin (r.android.com/2175906) that depends on
okio in cacheableImplementation configuration, but okio at a different
version is also pulled in by another dep in cacheableApi configuration.
To remove the risk of hitting this issue, remove this caching layer
that is now mostly redundant with Gradle configuration caching enabled.
Also upgrading to wire 4.4.1 as that fixes kotlinpoet classpath issues
Test: ./gradlew :benchmark:benchmark-common:generateDebugProtos success
with r.android.com/2175906 local patch.
Change-Id: Ib603a54d5970e8e29284a9cef62a994ca0bfdb5c
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index df01294..9dec36d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@
protobuf = "3.19.4"
skiko = "0.7.7"
sqldelight = "1.3.0"
-wire = "3.6.0"
+wire = "4.4.1"
[libraries]
androidAccessibilityFramework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version = { strictly = "2.1" } }
@@ -58,6 +58,7 @@
androidLintChecks = { module = "com.android.tools.lint:lint-checks", version.ref = "androidLint" }
androidLintChecksMin = { module = "com.android.tools.lint:lint-checks", version.ref = "androidLintMin" }
androidLintTests = { module = "com.android.tools.lint:lint-tests", version.ref = "androidLint" }
+androidToolsCommon = { module = "com.android.tools:common", version.ref = "androidLint" }
autoCommon = { module = "com.google.auto:auto-common", version = "0.11" }
atomicFu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicFu" }
atomicFuPluginz = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicFu" }
@@ -67,7 +68,9 @@
autoValueAnnotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autoValue" }
autoValueParcel = { module = "com.ryanharter.auto.value:auto-value-parcel", version = "0.2.6" }
antlr4 = { module = "org.antlr:antlr4", version = "4.7.1" }
+apacheAnt = { module = "org.apache.ant:ant", version = "1.10.11" }
apacheCommonsCodec = { module = "commons-codec:commons-codec", version = "1.15" }
+apacheCommonIo = { module = "commons-io:commons-io", version = "2.4" }
assertj = { module = "org.assertj:assertj-core", version = "3.11.1" }
checkerframework = { module = "org.checkerframework:checker-qual", version = "2.5.3" }
checkmark = { module = "net.saff.checkmark:checkmark", version = "0.1.2" }
@@ -96,6 +99,7 @@
hiltCore = { module = "com.google.dagger:hilt-core", version.ref = "hilt" }
intellijAnnotations = { module = "com.intellij:annotations", version = "12.0" }
javapoet = { module = "com.squareup:javapoet", version = "1.13.0" }
+json = { module = "org.json:json", version = "20180813" }
jsonSimple = { module = "com.googlecode.json-simple:json-simple", version = "1.1" }
jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version = "3.1" }
jsr250 = { module = "javax.annotation:javax.annotation-api", version = "1.2" }
