From 3f0420544a87a974a04b957606a2ace8f9b96e47 Mon Sep 17 00:00:00 2001 From: Mats Wahlberg Date: Tue, 21 Apr 2020 21:33:27 +0200 Subject: Updated circleci debug and release jobs to explicitly build Play flavors Changed the gradlew build targets assembleRelease to assemblePlayRelease and assembleDebug to assemblePlayDebug, because the old targets causes files for the free builds to get compiled when not needed. It's unnecessary and also done without -PfreeBuild which gives build errors. These are also the targets used in makeRelease.sh, so the workflow should better match the expected. --- core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 aff8081e2..6aa9982bc 100644 --- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java @@ -5,7 +5,10 @@ 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). + * 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; -- cgit v1.2.3