Merge maintenance/mps20243 into master #2683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ptions customizable through an extension point
* Specify the version and type of the JBR to use in the version catalog. * Use jbr-toolchain plugin to resolve the JBR. This makes it possible to share the JBR between subprojects without special tasks and task dependencies (as these are discouraged by Gradle).
build: upgrade to Gradle 8.12, introduce jbr-toolchain
[breaking] mpsutil.json: improve exporting of files and make parser and export options customizable through an extension point
…/mps20232 # Conflicts: # build.gradle # subprojects/com.mbeddr/build.gradle
Merge maintenance/mps20223 into maintenance/mps20232
…1' into merge/mps20241 # Conflicts: # build.gradle # subprojects/com.mbeddr/build.gradle
Merge maintenance/mps20232 into maintenance/mps20241
Merge maintenance/mps20241 into maintenance/mps20243
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from
maintenance/mps20243tomaster.