commit 80ae2c7f0ee9efd1f2b3b437bd860954ea1454ed
author Søren Gjesse <sgjesse@google.com> Thu Oct 26 12:04:01 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Thu Oct 26 10:22:01 2023 +0000
tree 80665bfd0598f9562361f06c6253511911c74180
parent 8ea20ac4540f3800f13f5f54c52d3456bf9409fe

Cleanup dependencies

* Remove the split between dependencies and dependencies_new
* Move all explicit Kotlin dependencies to 1.9.0
* Update Studio SDK dependencies to version 31.2.0-rc01

Bug: b/299065366
Change-Id: Ib6186ad32dd9ba753c128525446d5921f5e19074

d8_r8/resourceshrinker/build.gradle.kts

diff --git a/d8_r8/resourceshrinker/build.gradle.kts b/d8_r8/resourceshrinker/build.gradle.kts
index 750f076..c716378 100644
--- a/d8_r8/resourceshrinker/build.gradle.kts
+++ b/d8_r8/resourceshrinker/build.gradle.kts
@@ -36,9 +36,9 @@
   compileOnly(files(resolve(ThirdPartyDeps.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")
+  implementation("com.android.tools.layoutlib:layoutlib-api:31.2.0-rc01")
+  implementation("com.android.tools:common:31.2.0-rc01")
+  implementation("com.android.tools:sdk-common:31.2.0-rc01")
 }
 
 tasks {

d8_r8/resourceshrinker/settings.gradle.kts

diff --git a/d8_r8/resourceshrinker/settings.gradle.kts b/d8_r8/resourceshrinker/settings.gradle.kts
index d879107..31a3ce7 100644
--- a/d8_r8/resourceshrinker/settings.gradle.kts
+++ b/d8_r8/resourceshrinker/settings.gradle.kts
@@ -5,10 +5,10 @@
 pluginManagement {
   repositories {
     maven {
-      url = uri("file:../../third_party/dependencies")
+      url = uri("file:../../third_party/dependencies_plugin")
     }
     maven {
-      url = uri("file:../../third_party/dependencies_new")
+      url = uri("file:../../third_party/dependencies")
     }
   }
 }
@@ -18,9 +18,6 @@
     maven {
       url = uri("file:../../third_party/dependencies")
     }
-    maven {
-      url = uri("file:../../third_party/dependencies_new")
-    }
   }
 }