Merge master into staging-next

2018-11-29 08:12:56 +01:00
parent 9caab8ff4a 8d88e4f6c7
commit 9db2421d1f
177 changed files with 4259 additions and 2087 deletions
@@ -52,6 +52,16 @@ rec {
  };

  gradle_latest = gradleGen rec {
+    name = "gradle-5.0";
+    nativeVersion = "0.14";
+
+    src = fetchurl {
+      url = "http://services.gradle.org/distributions/${name}-bin.zip";
+      sha256 = "19krxq9pid9dg6bhdbhhg7ykm5kcx7lv7cr58rj67g0h6jgsqmv1";
+    };
+  };
+
+  gradle_4_10 = gradleGen rec {
    name = "gradle-4.10.2";
    nativeVersion = "0.14";

@@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    rake (12.0.0)
+    rake (12.3.1)

 PLATFORMS
  ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
  rake

 BUNDLED WITH
-   1.14.6
+   1.17.1
@@ -2,9 +2,9 @@
  rake = {
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
      type = "gem";
    };
-    version = "12.0.0";
+    version = "12.3.1";
  };
 }