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/src/free/java/de/danoeh/antennapod/core/ClientConfig.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'core/src/free') 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; -- cgit v1.2.3