honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates the build to gradle 4.9 (#32087) 

There are fixes to the dependency report, most importantly for us,
it still works even if `failOnVersionConflict` would fail the build.
This commit is contained in:
Alpar Torok 2018-07-17 11:41:31 +00:00 committed by GitHub
parent b655c11dbe
commit b43fe560a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -596,7 +596,7 @@ if (System.properties.get("build.compare") != null) {
} }
} }
sourceBuild { sourceBuild {
gradleVersion = "4.8.1" // does not default to gradle weapper of project dir, but current version gradleVersion = gradle.getGradleVersion()
projectDir = referenceProject projectDir = referenceProject
tasks = ["clean", "assemble"] tasks = ["clean", "assemble"]
arguments = ["-Dbuild.compare_friendly=true"] arguments = ["-Dbuild.compare_friendly=true"]

2
buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/RandomizedTestingPlugin.groovy
View File

@ -74,7 +74,7 @@ class RandomizedTestingPlugin implements Plugin<Project> {
// since we can't be sure if the task was ever realized, we remove both the provider and the task // since we can't be sure if the task was ever realized, we remove both the provider and the task
TaskProvider<Test> oldTestProvider TaskProvider<Test> oldTestProvider
try { try {
oldTestProvider = tasks.getByNameLater(Test, 'test') oldTestProvider = tasks.named('test')
} catch (UnknownTaskException unused) { } catch (UnknownTaskException unused) {
// no test task, ok, user will use testing task on their own // no test task, ok, user will use testing task on their own
return return

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionSha256Sum=ce1645ff129d11aad62dab70d63426fdce6cfd646fa309dc5dc5255dd03c7c11 distributionSha256Sum=39e2d5803bbd5eaf6c8efe07067b0e5a00235e8c71318642b2ed262920b27721