Merge "[Spa] Gradle and Android Gradle Plugin Upgrade" into main (92ed27d0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/.idea/vcs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,5 +11,9 @@
		</component>
		<component name="VcsDirectoryMappings">
		<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
		<mapping directory="$PROJECT_DIR$/../../../../../platform_testing" vcs="Git" />
		</component>
		<component name="VcsProjectSettings">
		<option name="detectVcsMappingsAutomatically" value="false" />
		</component>
		</project>
		No newline at end of file

+22 −15

Original line number	Diff line number	Diff line
		@@ -14,8 +14,12 @@
		* limitations under the License.
		*/

		import com.android.build.gradle.BaseExtension
		import com.android.build.gradle.api.AndroidBasePlugin
		import com.android.build.api.dsl.ApplicationExtension
		import com.android.build.api.dsl.CommonExtension
		import com.android.build.api.dsl.LibraryExtension
		import com.android.build.gradle.AppPlugin
		import com.android.build.gradle.BasePlugin
		import com.android.build.gradle.LibraryPlugin

		plugins {
		alias(libs.plugins.android.application) apply false
		@@ -31,22 +35,25 @@ allprojects {
		extra["jetpackComposeVersion"] = "1.9.0-alpha04"
		}

		subprojects {
		layout.buildDirectory.set(file("$androidTop/out/gradle-spa/$name"))
		allprojects {
		val projectBuildPath = path.replace(':', File.separatorChar)
		layout.buildDirectory = file("$androidTop/out/gradle-spa/$projectBuildPath/build")
		}

		plugins.withType<AndroidBasePlugin> {
		configure<BaseExtension> {
		compileSdkVersion(36)
		subprojects {
		plugins.withType<BasePlugin> {
		the(CommonExtension::class).apply { compileSdk = 36 }

		defaultConfig {
		targetSdk = 36
		configure<JavaPluginExtension> {
		toolchain { languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.get())) }
		}
		}

		configure<JavaPluginExtension> {
		toolchain {
		languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.get()))
		}
		plugins.withType<AppPlugin> {
		configure<ApplicationExtension> { defaultConfig { targetSdk = 36 } }
		}

		plugins.withType<LibraryPlugin> {
		configure<LibraryExtension> { testOptions { targetSdk = 36 } }
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		#

		[versions]
		agp = "8.10.1"
		agp = "8.11.0"
		dexmaker-mockito = "2.28.4"
		jvm = "21"
		kotlin = "2.1.10" # external/kotlinc/build.txt

deleted100644 → 0

−130 MiB

File deleted.

+122 B (42.7 KiB)

File changed.

No diff preview for this file type.