From 06d212b911af1ce54e03c63bad69b99e938cb430 Mon Sep 17 00:00:00 2001 From: Mats Wahlberg Date: Fri, 2 Oct 2020 14:39:02 +0200 Subject: Use freeImplementation for including conscrypt in Free builds. This removes the need for the -PfreeBuild flag to gradle, and makes assemblePlay and assembleDebug build all flavours without errors again. Changed circleci config back accordingly and removed comment about -PfreeBuild. Based on #4457. --- core/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/build.gradle') diff --git a/core/build.gradle b/core/build.gradle index e2ee3a0bd..71ad30ac1 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -88,10 +88,12 @@ dependencies { api "com.google.android.support:wearable:$wearableSupportVersion" compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion" } else { - System.out.println("core: free build hack, skipping some dependencies and bundling conscrypt ($conscryptVersion)") - implementation "org.conscrypt:conscrypt-android:$conscryptVersion" + System.out.println("core: free build hack, skipping some dependencies") } + // bundle conscrypt with free builds + freeImplementation "org.conscrypt:conscrypt-android:$conscryptVersion" + testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation 'junit:junit:4.13' testImplementation 'org.mockito:mockito-core:1.10.19' -- cgit v1.2.3