commit 52a24250a31c8383dfe218b25633a5876bb09e69
author Scott Pollom <spollom@google.com> Thu Aug 29 17:42:47 2024 +0000
committer Scott Pollom <spollom@google.com> Thu Aug 29 17:42:47 2024 +0000
tree 48dcfca66780e3aca31c5cdf5f19234a351a3782
parent 71a0e55934198cacb4c897d9b20e26e2b7275988

Use GRADLE_PLUGIN_VERSION for AGP settings plugin version, if set

Bug: NA
Test: existing
Change-Id: Ie1aaeb63347bfbb4a619eb374ee8723eaf1048c1

development/update_studio.sh

diff --git a/development/update_studio.sh b/development/update_studio.sh
index cdd888e..3fa7ebb 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -48,7 +48,7 @@
 sed -i "s/androidStudio = .*/androidStudio = \"$STUDIO_VERSION\"/g" gradle/libs.versions.toml
 
 # update settings.gradle
-sed -i "s/com.android.settings:com.android.settings.gradle.plugin:.*/com.android.settings:com.android.settings.gradle.plugin:$AGP_VERSION\")/g" settings.gradle
+sed -i "s/com.android.settings:com.android.settings.gradle.plugin:[0-9a-z\.\-]*/com.android.settings:com.android.settings.gradle.plugin:$AGP_VERSION\")/g" settings.gradle
 
 # Pull all UTP artifacts for ADT version
 ADT_VERSION=${3:-$LINT_VERSION}

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index 988cca5..ca5d8f6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -29,7 +29,12 @@
         classpath("com.gradle:develocity-gradle-plugin:3.18")
         classpath("com.gradle:common-custom-user-data-gradle-plugin:2.0.1")
         classpath("androidx.build.gradle.gcpbuildcache:gcpbuildcache:1.0.0-beta10")
-        classpath("com.android.settings:com.android.settings.gradle.plugin:8.7.0-alpha02")
+        def agpOverride = System.getenv("GRADLE_PLUGIN_VERSION")
+        if (agpOverride != null) {
+            classpath("com.android.settings:com.android.settings.gradle.plugin:$agpOverride")
+        } else {
+            classpath("com.android.settings:com.android.settings.gradle.plugin:8.7.0-alpha02")
+        }
     }
 }