status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: upgrade nixpkgs, clean up android sdk config 

Notable upgrades:

| Package        | Previous    | Current     |
|----------------|-------------|-------------|
| `glibc`        | `2.32`      | `2.33`      |
| `git`          | `2.31.1`    | `2.32.0`    |
| `clojure`      | `1.10.3.855`| `1.10.3.943`|
| `nodejs`       | `12.22.1`   | `12.22.6`   |
| `yarn`         | `1.22.10`   | `1.22.11`   |
| Platform Tools | `31.0.2`    | `31.0.3`    |
| Build Tools    | `30.0.3`    | `31.0.0`    |

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2021-07-22 15:38:59 +02:00
parent 88dc152e73
commit 5e9c7da96c
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/gradle.properties
View File

@ -25,7 +25,7 @@ kotlinVersion=1.3.50
minSdkVersion=23
compileSdkVersion=30
targetSdkVersion=30
buildToolsVersion=30.0.3
buildToolsVersion=31.0.0
supportLibVersion=28.0.0
# This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
gradlePluginVersion=3.5.4

4
nix/pkgs.nix
View File

@ -13,8 +13,8 @@ let
name = "nixpkgs-source";
owner = "NixOS";
repo = "nixpkgs";
rev = "76f53eef48cc6c340ed063c117aac75c4652627c";
sha256 = "0a2wn0ryq0ngd3ybc3ag70dp9z1x4w1jgy6qr4dzfnzbnn3s5246";
rev = "65135081f63ca2f5eaa9b7b54bfc7bf31502cfd6";
sha256 = "074lyh19x8xs8xqf4wwwl64870rpml96g7dhx1y09i81w5k29aga";
# To get the compressed Nix sha256, use:
# nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
};

17
nix/pkgs/android-sdk/compose.nix
View File

@ -5,25 +5,18 @@
{ stdenv, config, callPackage, androidenv, openjdk, mkShell }:
# The "android-sdk-license" license is accepted
# by setting android_sdk.accept_license = true.
androidenv.composeAndroidPackages {
toolsVersion = "26.1.1";
platformToolsVersion = "31.0.2";
buildToolsVersions = [ "30.0.3" ];
includeEmulator = false;
includeSources = false;
platformToolsVersion = "31.0.3";
buildToolsVersions = [ "31.0.0" ];
platformVersions = [ "30" ];
includeSystemImages = false;
systemImageTypes = [ "default" ];
cmakeVersions = [ "3.18.1" ];
includeNDK = true;
ndkVersion = "22.1.7171670";
useGoogleAPIs = false;
useGoogleTVAddOns = false;
includeNDK = true;
includeExtras = [
"extras;android;m2repository"
"extras;google;m2repository"
];
# The "android-sdk-license" license is accepted
# by setting android_sdk.accept_license = true.
extraLicenses = [];
}