Skip to content

Commit 4559426

Browse files
Bump com.android.tools.build:manifest-merger from 30.3.1 to 31.7.2 (#9528)
Context: https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger/31.7.2 Context: https://android.googlesource.com/platform/tools/base/+/master/build-system/manifest-merger I was not able to find a specific tag matching this release. Other changes: * Pass in `$(JavacSourceVersion)` and `$(JavacTargetVersion)` to the `gradle jar` task Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 5588e7d commit 4559426

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/manifestmerger/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919

2020
dependencies {
2121
// https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
22-
implementation 'com.android.tools.build:manifest-merger:30.3.1'
22+
implementation 'com.android.tools.build:manifest-merger:31.7.2'
2323
}
2424

2525
sourceSets {

src/manifestmerger/manifestmerger.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
WorkingDirectory="$(MSBuildThisFileDirectory)"
1414
/>
1515
<Exec
16-
Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs)"
16+
Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs) -PjavaSourceVer=$(JavacSourceVersion) -PjavaTargetVer=$(JavacTargetVersion)"
1717
EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory);APP_HOME=$(GradleHome)"
1818
WorkingDirectory="$(MSBuildThisFileDirectory)"
1919
/>

0 commit comments

Comments
 (0)