Change oshi test library logic for arm mac #13465
Merged
Conversation
This file contains hidden or 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
breedx-splk
reviewed
Mar 6, 2025
Contributor
breedx-splk
left a comment
breedx-splk
left a comment
There was a problem hiding this comment.
Hmmm...muzzle still has 5.3.1 though.
laurit
reviewed
Mar 7, 2025
| dependencies { | ||
| library("com.github.oshi:oshi-core:$oshiVersion") | ||
| // 5.5.0 is the first version that works on arm mac | ||
| library("com.github.oshi:oshi-core:5.5.0") |
Contributor
There was a problem hiding this comment.
if your goal is to remove the variable from library declaration then you could also
if (osdetector.os == "osx" && osdetector.arch == "aarch_64" && !(findProperty("testLatestDeps") as Boolean)) {
// 5.5.0 is the first version that works on arm mac
configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.github.oshi:oshi-core:5.5.0")
}
jaydeluca
changed the title
laurit
reviewed
Mar 7, 2025
Comment on lines
9
to
12
| if (osdetector.os == "osx" && osdetector.arch == "aarch_64" && !(findProperty("testLatestDeps") as Boolean)) { | ||
| // 5.5.0 is the first version that works on arm mac | ||
| configurations.testRuntimeClasspath.get().resolutionStrategy.force("com.github.oshi:oshi-core:5.5.0") | ||
| } |
Contributor
There was a problem hiding this comment.
usually we have stuff like this outside of the dependencies block, like in
laurit
approved these changes
Mar 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Discussed here
bumping the oshi minimum version to 5.5.0 and getting rid of the conditional for arm macremoving variable from declaration and handling the override in a different way