Use Android settings plugin to set NDK version.
Test: presubmit + manual validation of studio sync
Change-Id: I563ebe13169c238f5a17278ce9c0fb0d4b1ad870
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index 23bd3ab..29906ed 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
@@ -1031,7 +1031,6 @@
compileSdk = project.defaultAndroidConfig.compileSdk
buildToolsVersion = project.defaultAndroidConfig.buildToolsVersion
- ndkVersion = project.defaultAndroidConfig.ndkVersion
defaultConfig.minSdk = defaultMinSdk
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfig.kt b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfig.kt
index 8106d92..5667601 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfig.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/AndroidXConfig.kt
@@ -34,7 +34,6 @@
}
override val minSdk: Int = 21
- override val ndkVersion: String = "27.0.12077973"
override val targetSdk: Int by lazy {
project.providers.gradleProperty(TARGET_SDK_VERSION).get().toInt()
@@ -74,9 +73,6 @@
/** Default minimum SDK version used for AndroidX projects. */
val minSdk: Int
- /** NDK version used for AndroidX projects. */
- val ndkVersion: String
-
/**
* Default target SDK version used for AndroidX projects.
*
diff --git a/development/update_studio.sh b/development/update_studio.sh
index b154e4a..cdd888e 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -7,8 +7,8 @@
# Versions that the user should update when running this script
echo Getting Studio version and link
-AGP_VERSION=${1:-8.7.0-alpha02}
-STUDIO_VERSION_STRING=${2:-"Android Studio Ladybug | 2024.1.3 Canary 2"}
+AGP_VERSION=${1:-8.7.0-alpha03}
+STUDIO_VERSION_STRING=${2:-"Android Studio Ladybug | 2024.1.3 Canary 3"}
# Get studio version number from version name
STUDIO_IFRAME_LINK=`curl "https://developer.android.com/studio/archive.html" | grep "<iframe " | sed "s/.* src=\"\([^\"]*\)\".*/\1/g"`
@@ -27,6 +27,7 @@
ARTIFACTS_TO_DOWNLOAD="com.android.tools.build:gradle:$AGP_VERSION,"
ARTIFACTS_TO_DOWNLOAD+="androidx.databinding:viewbinding:$AGP_VERSION,"
ARTIFACTS_TO_DOWNLOAD+="com.android.kotlin.multiplatform.library:com.android.kotlin.multiplatform.library.gradle.plugin:$AGP_VERSION,"
+ARTIFACTS_TO_DOWNLOAD+="com.android.settings:com.android.settings.gradle.plugin:$AGP_VERSION,"
AAPT2_VERSIONS=`curl "https://dl.google.com/dl/android/maven2/com/android/tools/build/group-index.xml" | grep aapt2-proto | sed 's/.*versions="\(.*\)"\/>/\1/g'`
AAPT2_VERSION=`echo $AAPT2_VERSIONS | sed "s/.*\($AGP_VERSION-[0-9]*\).*/\1/g"`
ARTIFACTS_TO_DOWNLOAD+="com.android.tools.build:aapt2:$AAPT2_VERSION:linux,"
@@ -46,6 +47,9 @@
sed -i "s/androidLint = \".*/androidLint = \"$LINT_VERSION\"/g" gradle/libs.versions.toml
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
+
# Pull all UTP artifacts for ADT version
ADT_VERSION=${3:-$LINT_VERSION}
while read line
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 92e6ded..e861aaf6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -389,6 +389,7 @@
<trusting group="com.android.tools.layoutlib"/>
<trusting group="com.android.tools.lint"/>
<trusting group="com.android.tools.utp"/>
+ <trusting group="com.android.settings"/>
<trusting group="^androidx\..*" regex="true"/>
</trusted-key>
<trusted-key id="A6D6C97108B8585F91B158748671A8DF71296252" group="^com[.]squareup($|([.].*))" regex="true"/>
diff --git a/settings.gradle b/settings.gradle
index 8b0d2ad..52d6ec0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -29,6 +29,7 @@
classpath("com.gradle:develocity-gradle-plugin:3.17.2")
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")
}
}
@@ -76,6 +77,11 @@
apply(plugin: "com.gradle.develocity")
apply(plugin: "com.gradle.common-custom-user-data-gradle-plugin")
apply(plugin: "androidx.build.gradle.gcpbuildcache")
+apply(plugin: "com.android.settings")
+
+android {
+ ndkVersion = "27.0.12077973"
+}
def BUILD_NUMBER = System.getenv("BUILD_NUMBER")
develocity {
