Skip to content

Backporting support for gradle for 7.3 #1919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2022

Conversation

masseyke
Copy link
Member

This commit backports #1800 and #1809 in order to support gradle 7.3 since gradle 7.3 is required in order
to build against elasticsearch 7.17.1 due to elastic/elasticsearch#84023.

masseyke and others added 2 commits February 23, 2022 15:40
…lastic#1800)

Gradle 7.2 broke scala 2.10 compilation. The problem seems to be that the java boot classpath jars are
no longer getting into the scala boot classpath. This commit sets it in two ways: (1) it is explicitly set it
in scalaCompileOptions.additionalParameters (to prevent the build from failing) and (2) it is set in options.bootstrapClasspath to prevent warnings from javac that its boot classpath is incompatible with
the source version.
Copy link
Member

@jbaiera jbaiera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@masseyke masseyke merged commit 97782eb into elastic:7.17 Feb 23, 2022
@masseyke masseyke deleted the fix/support-gradle-7.2-7.17 branch February 23, 2022 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants