Merge branch 'main' into dev/grendel/clr-host-really-enable

grendello · grendello · commit 7d0af98410d6 · 2025-03-10T20:16:03.000+01:00
* main: Bump com.android.tools.build:manifest-merger from 31.8.2 to 31.9.0 (#9898)
diff --git a/src/manifestmerger/build.gradle b/src/manifestmerger/build.gradle
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
-    implementation 'com.android.tools.build:manifest-merger:31.8.2'
+    implementation 'com.android.tools.build:manifest-merger:31.9.0'
 }
 
 sourceSets {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ repositories {`
`19`	`19`
`20`	`20`	`dependencies {`
`21`	`21`	`// https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger`
`22`		`- implementation 'com.android.tools.build:manifest-merger:31.8.2'`
	`22`	`+ implementation 'com.android.tools.build:manifest-merger:31.9.0'`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`sourceSets {`