Revert "gradle: upgrade plugin to 3.6.0"

This reverts commit 938f3df843.

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Roman Volosovskyi 2020-04-22 14:11:34 +03:00 committed by Andrey Shovkoplyas
parent d9862e2cef
commit 9d59d82869
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
4 changed files with 4270 additions and 5553 deletions

View File

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

View File

@ -10,9 +10,7 @@ let
let
srcs = import ./maven-sources.nix { };
system = if stdenv.isDarwin then "osx" else "linux";
# Warning: This must be the same as gradlePluginVersion android/gradle.properties
version = "3.6.0-6040484";
aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-${system}";
aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.4.1-5326820/aapt2-3.4.1-5326820-${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