define "full" and "debug" as the default build flavors
Running standard tasks like `gradle test` was only running the lint and test for the basic flavor, when really, the full flavor should always take precedence. If you look at: https://gitlab.com/fdroid/fdroidclient/-/jobs/3495360444 You can see that app:lintBasicDebug gets run, but app:lintFullDebug does not. Unfortunately, Gradle just alpha-sorts flavors by default to set priority.
This commit is contained in:
parent
f6d77ee5e7
commit
5ccdc68408
|
@ -60,6 +60,7 @@ test_lint_pmd_checkstyle:
|
|||
script:
|
||||
# always report on lint errors to the build log
|
||||
- sed -i -e 's,textReport .*,textReport true,' app/build.gradle
|
||||
# the tasks "lint", "test", etc don't always include everything
|
||||
- ./gradlew lint pmd checkstyle ktlintCheck testDebugUnitTest testFullDebugUnitTest
|
||||
|
||||
tools scripts:
|
||||
|
|
|
@ -62,6 +62,7 @@ android {
|
|||
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
|
||||
}
|
||||
debug {
|
||||
getIsDefault().set(true)
|
||||
manifestPlaceholders = [ applicationLabel: APP_NAME_DEBUG ]
|
||||
applicationIdSuffix ".debug"
|
||||
resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
|
||||
|
@ -75,6 +76,7 @@ android {
|
|||
flavorDimensions "base"
|
||||
productFlavors {
|
||||
full {
|
||||
getIsDefault().set(true)
|
||||
dimension "base"
|
||||
applicationId fullApplicationId
|
||||
resValue "string", "applicationId", fullApplicationId
|
||||
|
|
|
@ -3,6 +3,12 @@
|
|||
<!-- TODO bump our targetSdkVersion when we are ready for it -->
|
||||
<issue id="ExpiredTargetSdkVersion" severity="ignore"/>
|
||||
|
||||
<!-- TODO This should be handled as part of an overhaul of Bluetooth swap -->
|
||||
<issue id="MissingPermission" severity="">
|
||||
<ignore path="src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java"/>
|
||||
<ignore path="src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java"/>
|
||||
</issue>
|
||||
|
||||
<!-- Our translations are crowd-sourced -->
|
||||
<issue id="MissingTranslation" severity="ignore"/>
|
||||
|
||||
|
|
Loading…
Reference in New Issue