diff options
| author | Mats Wahlberg <rcxslinger@gmail.com> | 2020-10-02 14:39:02 +0200 |
|---|---|---|
| committer | Mats Wahlberg <rcxslinger@gmail.com> | 2020-10-02 14:39:02 +0200 |
| commit | 06d212b911af1ce54e03c63bad69b99e938cb430 (patch) | |
| tree | d1b458a300512894266fbb8ff7ccef6a24479eac /core | |
| parent | 468acab8f45bc076806fe7f6bfde3585526f19ca (diff) | |
| download | AntennaPod-06d212b911af1ce54e03c63bad69b99e938cb430.zip | |
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/build.gradle | 6 | ||||
| -rw-r--r-- | core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java | 8 |
2 files changed, 4 insertions, 10 deletions
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' diff --git a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java index 6aa9982bc..37905b556 100644 --- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java @@ -2,14 +2,6 @@ package de.danoeh.antennapod.core; import android.content.Context; import java.security.Security; - -/* - * If you get an error here ("package org.conscrypt does not exist"), you are probably doing a free - * build and didn't pass "-PfreeBuild" to gradle (e.g. "./gradlew assembleFreeRelease -PfreeBuild"). - * - * If you are doing a non-free build using "assembleRelease" or "assembleDebug" and get this error, - * use "assemblePlayRelease" or "assemblePlayDebug" instead (e.g. "./gradlew assemblePlayRelease"). - */ import org.conscrypt.Conscrypt; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; |