Skip to content

Update gradle wrapper to Gradle 6.7 (7.x backport) #63909

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.

Sign up for GitHub

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
Oct 22, 2020
Merged

Update gradle wrapper to Gradle 6.7 (7.x backport) #63909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4873a
Update gradle wrapper to Gradle 6.7 (#62386)
breskeby Oct 20, 2020
b894b44
Fix gradle deprecation
breskeby Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/resources/minimumGradleVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.6.1
6.7
5 changes: 4 additions & 1 deletion buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public class GradleThreadsFilter implements ThreadFilter {

@Override
public boolean reject(Thread t) {
return t.getName().startsWith("Exec process") || t.getName().startsWith("File watcher consumer");
return t.getName().startsWith("Exec process")
|| t.getName().startsWith("File watcher consumer")
|| t.getName().startsWith("Memory manager");

}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583
6 changes: 3 additions & 3 deletions x-pack/plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ subprojects {
afterEvaluate {
if (project.plugins.hasPlugin(PluginBuildPlugin)) {
// see the root Gradle file for additional logic regarding this configuration
project.configurations.create('featureAwarePlugin')
project.dependencies.add('featureAwarePlugin', project.configurations.compileClasspath)
def featureAwarePluginConfiguration = project.configurations.create('featureAwarePlugin')
featureAwarePluginConfiguration.extendsFrom(project.configurations.compileClasspath)
project.dependencies.add('featureAwarePlugin', project(':x-pack:test:feature-aware'))
project.dependencies.add('featureAwarePlugin', project.sourceSets.main.output.getClassesDirs())

Expand All @@ -49,7 +49,7 @@ subprojects {
final FileCollection classDirectories = project.files(files).filter { it.exists() }

doFirst {
args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
args('-cp', featureAwarePluginConfiguration.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
classDirectories.each { args it.getAbsolutePath() }
}
doLast {
Expand Down