fix Gradle plugin by upgrading to 3.5.3

We tried upgrading to 3.6.0 but it made app fail to start:
https://github.com/status-im/status-react/pull/10402

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-04-22 14:00:04 +02:00
parent c805333bcd
commit 2a4641684f
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
4 changed files with 4656 additions and 4621 deletions

View File

@ -27,7 +27,8 @@ compileSdkVersion=29
targetSdkVersion=29
buildToolsVersion=29.0.2
supportLibVersion=28.0.0
gradlePluginVersion=3.4.1
# This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
gradlePluginVersion=3.5.3
android.useAndroidX=true
android.enableJetifier=true

View File

@ -10,7 +10,9 @@ let
let
srcs = import ./maven-sources.nix { };
system = if stdenv.isDarwin then "osx" else "linux";
aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.4.1-5326820/aapt2-3.4.1-5326820-${system}";
# Warning: This must be the same as gradlePluginVersion android/gradle.properties
version = "3.5.3-5435860";
aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-${system}";
in srcs // (if !stdenv.isLinux then { } else {
# On Linux, we need to patch the interpreter in Java packages that contain native executables to use Nix's interpreter instead
"${aapt2NativePkg}" = srcs."${aapt2NativePkg}" // {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff