Support Gradle 7 #1609
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,7 @@ | |
| import org.gradle.api.Action; | ||
| import org.gradle.api.GradleException; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.api.Task; | ||
| import org.gradle.api.logging.LogLevel; | ||
| import org.gradle.api.provider.Provider; | ||
| import org.gradle.api.tasks.TaskProvider; | ||
|
|
@@ -80,77 +81,83 @@ TaskProvider<LoggedExec> bwcTask(String name, Action<LoggedExec> configuration) | |
| } | ||
|
|
||
| private TaskProvider<LoggedExec> createRunBwcGradleTask(Project project, String name, Action<LoggedExec> configAction) { | ||
| return project.getTasks().register(name, LoggedExec.class, new Action<LoggedExec>() { | ||
| @Override | ||
| public void execute(LoggedExec loggedExec) { | ||
| // TODO revisit | ||
| loggedExec.dependsOn("checkoutBwcBranch"); | ||
| loggedExec.setSpoolOutput(true); | ||
| loggedExec.setWorkingDir(checkoutDir.get()); | ||
| loggedExec.doFirst(new Action<Task>() { | ||
|
There was a problem hiding this comment. Reason: Using Java lambdas is not supported as task inputs. Please refer to https://docs.gradle.org/7.3/userguide/validation_problems.html#implementation_unknown for more details about this problem. |
||
| @Override | ||
| public void execute(Task t) { | ||
| // Execution time so that the checkouts are available | ||
| String javaVersionsString = readFromFile(new File(checkoutDir.get(), ".ci/java-versions.properties")); | ||
| loggedExec.environment( | ||
| "JAVA_HOME", | ||
| getJavaHome( | ||
| Integer.parseInt( | ||
| Arrays.asList(javaVersionsString.split("\n")) | ||
| .stream() | ||
| .filter(l -> l.trim().startsWith("OPENSEARCH_BUILD_JAVA=")) | ||
| .map(l -> l.replace("OPENSEARCH_BUILD_JAVA=java", "").trim()) | ||
| .map(l -> l.replace("OPENSEARCH_BUILD_JAVA=openjdk", "").trim()) | ||
| .collect(Collectors.joining("!!")) | ||
| ) | ||
| ) | ||
| ); | ||
| loggedExec.environment( | ||
| "RUNTIME_JAVA_HOME", | ||
| getJavaHome( | ||
| Integer.parseInt( | ||
| Arrays.asList(javaVersionsString.split("\n")) | ||
| .stream() | ||
| .filter(l -> l.trim().startsWith("OPENSEARCH_RUNTIME_JAVA=")) | ||
| .map(l -> l.replace("OPENSEARCH_RUNTIME_JAVA=java", "").trim()) | ||
| .map(l -> l.replace("OPENSEARCH_RUNTIME_JAVA=openjdk", "").trim()) | ||
| .collect(Collectors.joining("!!")) | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
| }); | ||
|
|
||
| if (Os.isFamily(Os.FAMILY_WINDOWS)) { | ||
| loggedExec.executable("cmd"); | ||
| loggedExec.args("/C", "call", new File(checkoutDir.get(), "gradlew").toString()); | ||
| } else { | ||
| loggedExec.executable(new File(checkoutDir.get(), "gradlew").toString()); | ||
| } | ||
| if (project.getGradle().getStartParameter().isOffline()) { | ||
| loggedExec.args("--offline"); | ||
| } | ||
| // TODO resolve | ||
| String buildCacheUrl = System.getProperty("org.opensearch.build.cache.url"); | ||
| if (buildCacheUrl != null) { | ||
| loggedExec.args("-Dorg.opensearch.build.cache.url=" + buildCacheUrl); | ||
| } | ||
|
|
||
| loggedExec.args("-Dbuild.snapshot=true"); | ||
| loggedExec.args("-Dscan.tag.NESTED"); | ||
| final LogLevel logLevel = project.getGradle().getStartParameter().getLogLevel(); | ||
| List<LogLevel> nonDefaultLogLevels = Arrays.asList(LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG); | ||
| if (nonDefaultLogLevels.contains(logLevel)) { | ||
| loggedExec.args("--" + logLevel.name().toLowerCase(Locale.ENGLISH)); | ||
| } | ||
| final String showStacktraceName = project.getGradle().getStartParameter().getShowStacktrace().name(); | ||
| assert Arrays.asList("INTERNAL_EXCEPTIONS", "ALWAYS", "ALWAYS_FULL").contains(showStacktraceName); | ||
| if (showStacktraceName.equals("ALWAYS")) { | ||
| loggedExec.args("--stacktrace"); | ||
| } else if (showStacktraceName.equals("ALWAYS_FULL")) { | ||
| loggedExec.args("--full-stacktrace"); | ||
| } | ||
| if (project.getGradle().getStartParameter().isParallelProjectExecutionEnabled()) { | ||
| loggedExec.args("--parallel"); | ||
| } | ||
| loggedExec.setStandardOutput(new IndentingOutputStream(System.out, unreleasedVersionInfo.get().version)); | ||
| loggedExec.setErrorOutput(new IndentingOutputStream(System.err, unreleasedVersionInfo.get().version)); | ||
| configAction.execute(loggedExec); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reason: Using Java lambdas is not supported as task inputs. Please refer to https://docs.gradle.org/7.3/userguide/validation_problems.html#implementation_unknown for more details about this problem.