diff options
| author | Mats Wahlberg <rcxslinger@gmail.com> | 2020-04-21 21:33:27 +0200 |
|---|---|---|
| committer | Mats Wahlberg <rcxslinger@gmail.com> | 2020-09-30 13:52:31 +0200 |
| commit | 3f0420544a87a974a04b957606a2ace8f9b96e47 (patch) | |
| tree | 64052ec449d41e0d0f7f4ad3c5d56c27cc2142f3 | |
| parent | 4c24d1c29a726a67eabf86a9f9866e5daeca4ae8 (diff) | |
| download | AntennaPod-3f0420544a87a974a04b957606a2ace8f9b96e47.zip | |
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.
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index ccdd5aaee..a0cf32f37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ workflows: build-steps: - run: name: Build debug - command: ./gradlew assembleDebug -PdisablePreDex + command: ./gradlew assemblePlayDebug -PdisablePreDex - run: name: Execute debug unit tests command: ./gradlew :core:testPlayDebugUnitTest -PdisablePreDex @@ -47,7 +47,7 @@ workflows: build-steps: - run: name: Build release - command: ./gradlew assembleRelease -PdisablePreDex + command: ./gradlew assemblePlayRelease -PdisablePreDex - run: name: Execute release unit tests command: ./gradlew :core:testPlayReleaseUnitTest -PdisablePreDex 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; |