From cf0a799d7c321f57628820c98b1d7615e4f51703 Mon Sep 17 00:00:00 2001 From: TaaviE Date: Thu, 22 Mar 2018 22:01:59 +0200 Subject: [PATCH] Re-enabled AAPT2. --- app/build.gradle | 7 +++++-- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fcfb72621..beffac80b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,10 @@ android { } testOptions { - unitTests.returnDefaultValues = true + unitTests { + returnDefaultValues = true + includeAndroidResources = true + } } } @@ -59,7 +62,7 @@ dependencies { // testImplementation "ch.qos.logback:logback-core:1.1.3" testImplementation "junit:junit:4.12" testImplementation "org.mockito:mockito-core:1.10.19" - testImplementation "org.robolectric:robolectric:3.5.1" + testImplementation "org.robolectric:robolectric:3.6.1" implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "com.android.support:appcompat-v7:27.0.2" diff --git a/gradle.properties b/gradle.properties index 0b19e8f87..e68841626 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.enableAapt2=false +android.enableAapt2=true