Skip to content

Commit

Permalink
Bump com.android.tools.build:manifest-merger from 30.3.1 to 31.7.2 (#…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
jonathanpeppers and dependabot[bot] authored Nov 20, 2024
1 parent 5588e7d commit 4559426
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/manifestmerger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

dependencies {
// https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
implementation 'com.android.tools.build:manifest-merger:30.3.1'
implementation 'com.android.tools.build:manifest-merger:31.7.2'
}

sourceSets {
Expand Down
2 changes: 1 addition & 1 deletion src/manifestmerger/manifestmerger.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
WorkingDirectory="$(MSBuildThisFileDirectory)"
/>
<Exec
Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs)"
Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs) -PjavaSourceVer=$(JavacSourceVersion) -PjavaTargetVer=$(JavacTargetVersion)"
EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory);APP_HOME=$(GradleHome)"
WorkingDirectory="$(MSBuildThisFileDirectory)"
/>
Expand Down

0 comments on commit 4559426

Please sign in to comment.