Merge pull request #67743 from averelld/gradle-upgrade

gradle: 5.3.1 -> 5.6.1
This commit is contained in:
Marek Mahut 2019-08-30 10:46:27 +02:00 committed by GitHub
commit b122bbf116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -51,15 +51,15 @@ rec {
};
};
gradle_latest = gradle_5_3;
gradle_latest = gradle_5_6;
gradle_5_3 = gradleGen rec {
name = "gradle-5.3.1";
nativeVersion = "0.17";
gradle_5_6 = gradleGen rec {
name = "gradle-5.6.1";
nativeVersion = "0.18";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w";
sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9";
};
};

View File

@ -9605,7 +9605,7 @@ in
gradle_2 = gradle_2_14;
gradle_3 = gradle_3_5;
gradle_4 = gradle_4_10;
gradle_5 = res.gradleGen.gradle_5_3;
gradle_5 = res.gradleGen.gradle_5_6;
gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches.