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

View File

@ -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

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
* 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;