Skip to content

Commit 5d58154

Browse files
authored
Build: Upgrade min gradle to 3.3 (#23544)
This will allow us to get rid of deprecation warnings that appear when using 3.3, and also get rid of extra logic for 2.13 required because of the progress logger.
1 parent f56900d commit 5d58154

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Contributing to the Elasticsearch codebase
8888
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
8989

9090
Make sure you have [Gradle](http://gradle.org) installed, as
91-
Elasticsearch uses it as its build system. Gradle must be version 2.13 _exactly_ in
92-
order to build successfully.
91+
Elasticsearch uses it as its build system. Gradle must be at least
92+
version 3.3 in order to build successfully.
9393

9494
Eclipse users can automatically configure their IDE: `gradle eclipse`
9595
then `File: Import: Existing Projects into Workspace`. Select the

README.textile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo
200200

201201
h3. Building from Source
202202

203-
Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have version 2.13 of Gradle installed.
203+
Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have at least version 3.3 of Gradle installed.
204204

205205
In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory.
206206

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ apply plugin: 'groovy'
2323

2424
group = 'org.elasticsearch.gradle'
2525

26-
if (GradleVersion.current() < GradleVersion.version('2.13')) {
27-
throw new GradleException('Gradle 2.13+ is required to build elasticsearch')
26+
if (GradleVersion.current() < GradleVersion.version('3.3')) {
27+
throw new GradleException('Gradle 3.3+ is required to build elasticsearch')
2828
}
2929

3030
if (JavaVersion.current() < JavaVersion.VERSION_1_8) {

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class BuildPlugin implements Plugin<Project> {
122122
}
123123

124124
// enforce gradle version
125-
GradleVersion minGradle = GradleVersion.version('2.13')
125+
GradleVersion minGradle = GradleVersion.version('3.3')
126126
if (GradleVersion.current() < minGradle) {
127127
throw new GradleException("${minGradle} or above is required to build elasticsearch")
128128
}

0 commit comments

Comments
 (0)