Use Gradle toolchains to build ORT with a consistent Java version #8411
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
See [1]. [1]: https://docs.gradle.org/current/userguide/writing_build_scripts.html#script-default-imports Signed-off-by: Sebastian Schuberth <[email protected]>
The bogus warning from [1] cannot be reproduced anymore when running
./gradlew --rerun-tasks --no-build-cache --no-configuration-cache \
:buildSrc:build
[1]: https://youtrack.jetbrains.com/issue/KT-48745
Signed-off-by: Sebastian Schuberth <[email protected]>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
sschuberth
force-pushed
the
use-gradle-toolchains
branch
2 times, most recently
from
30e85e1 to
49c08db
Compare
The previous code was calling `JavaVersion.current()` at build time, assuming that the Java version running Gradle is the same Java version used for building ORT. This assumption makes it more difficult to build ORT for different Java versions in the same environment. Solve that by using Gradle's toolchains mechanism [1] instead. Choose Java 11 as the default for the new `javaLanguageVersion` property to support analyzing older projects with ORT, also see [2]. [1]: https://docs.gradle.org/current/userguide/toolchains.html [2]: #8249 Signed-off-by: Sebastian Schuberth <[email protected]>
Ensure to get values in exactly the same way as main ORT itself does. Signed-off-by: Sebastian Schuberth <[email protected]>
Signed-off-by: Sebastian Schuberth <[email protected]>
sschuberth
force-pushed
the
use-gradle-toolchains
branch
from
49c08db to
93a7f37
Compare
sschuberth
commented
Mar 14, 2024
| @@ -23,6 +23,9 @@ org.gradle.parallel = true | |||
|
|
|||
| kotlin.code.style = official | |||
|
|
|||
| # The version of the JDK to use for building ORT. | |||
| javaLanguageVersion = 11 | |||
There was a problem hiding this comment.
BTW, I'd be fine with giving this another / shorter name. Maybe just buildJdk?
There was a problem hiding this comment.
I'm fine with either name, but add javaToolchainVersion to the candidates.
|
Based on this, we could also do some simplifications regarding the GitHub workflows and Docker images, but I'll do these separately as a follow-up. |
mnonnenmacher
approved these changes
Mar 14, 2024
| @@ -23,6 +23,9 @@ org.gradle.parallel = true | |||
|
|
|||
| kotlin.code.style = official | |||
|
|
|||
| # The version of the JDK to use for building ORT. | |||
| javaLanguageVersion = 11 | |||
There was a problem hiding this comment.
I'm fine with either name, but add javaToolchainVersion to the candidates.
See #8414 for a start. |
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.
Please have a look at the individual commit messages for the details.