Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Mats Wahlberg 2020-04-21 21:33:27 +02:00
parent 4c24d1c29a
commit 3f0420544a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -38,7 +38,7 @@ workflows:
build-steps: build-steps:
- run: - run:
name: Build debug name: Build debug
command: ./gradlew assembleDebug -PdisablePreDex command: ./gradlew assemblePlayDebug -PdisablePreDex
- run: - run:
name: Execute debug unit tests name: Execute debug unit tests
command: ./gradlew :core:testPlayDebugUnitTest -PdisablePreDex command: ./gradlew :core:testPlayDebugUnitTest -PdisablePreDex
@ -47,7 +47,7 @@ workflows:
build-steps: build-steps:
- run: - run:
name: Build release name: Build release
command: ./gradlew assembleRelease -PdisablePreDex command: ./gradlew assemblePlayRelease -PdisablePreDex
- run: - run:
name: Execute release unit tests name: Execute release unit tests
command: ./gradlew :core:testPlayReleaseUnitTest -PdisablePreDex command: ./gradlew :core:testPlayReleaseUnitTest -PdisablePreDex

5
core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java
View File

@ -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 * 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; import org.conscrypt.Conscrypt;