`:vector-app` level variants #6788

ouchadam · 2022-08-09T14:08:03Z

Type of change

Feature
Bugfix
Technical
Other :

Content

Lifts the debug, release, gplay and fdroid source-sets to the application module. Allows the majority of the application to be cached between variant builds
Enables the gradle build cache by default

Motivation and context

To help improve the compilation time

Screenshots / GIFs

No UI changes

Tests

Smoke test with all the different variants/build types

Tested devices

Physical
Emulator
OS version(s): 28

sonarqubecloud · 2022-08-09T17:16:11Z

SonarCloud Quality Gate failed.

0 Bugs
1 Vulnerability
5 Security Hotspots
9 Code Smells

0.0% Coverage
0.0% Duplication

vector-app/src/debug/AndroidManifest.xml

bmarty

LGTM, thanks, just one question.

bmarty · 2022-09-08T14:15:16Z

vector/build.gradle

        exclude group: 'com.google.android.gms', module: 'play-services-location'
    }
-    fdroidApi(libs.maplibre.pluginAnnotation) {
+    api(libs.maplibre.pluginAnnotation) {


Will we have a pb here for gplay? group exclusion was not active for this variant. Just to double check.

it's excluded from the mapLibre dependency and then added back at the application level for the gPlay variant https://github.com/vector-im/element-android/pull/6788/files#diff-6998d5441936ca2baa15113a1f9f709549aeaaf929fedc553b94a67cc9a94833R374

bmarty

LGTM, thanks for the update.

bmarty · 2022-09-12T15:20:05Z

gradle.properties

@@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true


I have heard that enabling cache can be slower on the CI because it can take more time to retrieve and unzip the cache than download everything again. Do you have any thoughts on it?

this gradle flag enables the build cache, which relative to the existing gradle cache we're already saving on the CI is only about 300MB~ more

Current CI ~1925 MB https://github.com/vector-im/element-android/runs/8282616819?check_suite_focus=true

With build caching ~2197 MB https://github.com/vector-im/element-android/runs/8309095369?check_suite_focus=true

is about 15 seconds slower~

OK, thanks for checking the duration!

bmarty · 2022-09-12T15:22:51Z

vector-app/build.gradle

+
+    buildFeatures {
+        viewBinding true
+    }


Sorry, I had removed this in #7014 because it was not used. There are maybe other changes to revert on my PR.

I'll smoke test the different builds 🤞 this was added as it's now used by the debug fragments

can confirm fdroid, nightly, debug and release builds can log in and send a message

ouchadam · 2022-09-16T09:36:53Z

vector-app/src/debug/AndroidManifest.xml

+        <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
+        <activity android:name="im.vector.app.features.debug.leak.DebugMemoryLeaksActivity" />
+
+        <activity


re-adding comment - this is a debug only manifest ^^^

…fest

…alue

…erage to avoid needing to specify every module

… root level

- fixes the androidTests expecting a shortcuts xml

ElementBot · 2022-09-15T14:19:48Z

	Warnings
⚠️	vector-app/src/main/AndroidManifest.xml#L8 - The attribute `android:allowBackup` is deprecated from Android 12 and higher and may be removed in future versions. Consider adding the attribute `android:dataExtractionRules` specifying an `@xml` resource which configures cloud backups and device transfers on Android 12 and higher.
⚠️	vector-app/src/main/AndroidManifest.xml#L8 - The attribute `android:allowBackup` is deprecated from Android 12 and higher and may be removed in future versions. Consider adding the attribute `android:dataExtractionRules` specifying an `@xml` resource which configures cloud backups and device transfers on Android 12 and higher.
⚠️	vector/src/main/AndroidManifest.xml#L203 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L203 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L206 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L206 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L260 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L260 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L269 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L269 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L276 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L276 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L282 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L282 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L399 - Exported receiver does not require permission
⚠️	vector/src/main/AndroidManifest.xml#L399 - Exported receiver does not require permission

Generated by 🚫 dangerJS against 60b164a

sonarqubecloud · 2022-09-15T16:31:26Z

SonarCloud Quality Gate failed.

0 Bugs
1 Vulnerability
3 Security Hotspots
4 Code Smells

10.9% Coverage
0.0% Duplication

We do not use `android-embedded_fcm_distributor` anymore (since #7068). The code was compiling this `android-embedded_fcm_distributor` has a dependency on `firebase-messaging`.

We do not use `android-embedded_fcm_distributor` anymore (since #7068). The code was compiling because `android-embedded_fcm_distributor` has a dependency on `firebase-messaging`.

…regression Fix regression on our dependency, due to merge of #6788.

ouchadam added the A-DevX Anything that can improve the DevX label Aug 9, 2022

ouchadam changed the base branch from develop to feature/adm/variants-base August 9, 2022 14:15

github-advanced-security bot found potential problems Aug 9, 2022

View reviewed changes

vector-app/src/debug/AndroidManifest.xml Fixed Show resolved Hide resolved

ouchadam changed the base branch from feature/adm/variants-base to feature/adm/strings-module August 11, 2022 14:03

ouchadam changed the base branch from feature/adm/strings-module to feature/adm/variants-base August 11, 2022 14:05

ouchadam force-pushed the feature/adm/app-level-variant-v2 branch from 84e5a38 to 8b5a49c Compare August 11, 2022 14:26

ouchadam changed the base branch from feature/adm/variants-base to feature/adm/strings-module August 11, 2022 14:27

ouchadam force-pushed the feature/adm/strings-module branch 4 times, most recently from b53184b to 22ce829 Compare September 1, 2022 13:58

Base automatically changed from feature/adm/strings-module to develop September 1, 2022 15:11

ouchadam force-pushed the feature/adm/app-level-variant-v2 branch from 8b5a49c to c773eda Compare September 1, 2022 15:26

ouchadam marked this pull request as ready for review September 1, 2022 15:44

bmarty reviewed Sep 8, 2022

View reviewed changes

ouchadam force-pushed the feature/adm/app-level-variant-v2 branch from 3800c66 to d1b3104 Compare September 12, 2022 11:17

bmarty approved these changes Sep 12, 2022

View reviewed changes

github-advanced-security bot found potential problems Sep 14, 2022

View reviewed changes

ouchadam added 11 commits September 15, 2022 14:50

lifting nightly to the application module

b72a174

lifting the release build type to the application module

a947a53

lifting debug build type to the application module

5d533d4

split commit to make debug changes to avoid files being seen as new!

373a0ca

lifting fdroid and gplay variants to the application module

3a38898

enabling build caching by default to improve build times

0691046

adding changelog entry

32a15be

removing extra application id declaration

0c469ae

fixing manifest imports and giving androidTest its own dedicated mani…

1d50bbd

…fest

suppressing lint warning for constant that delegates to the correct v…

9e5f07a

…alue

adding missing nightly source inclusions

e9e2960

ouchadam added 3 commits September 15, 2022 14:50

using the top level debug unit test task when executing tests for cov…

68da403

…erage to avoid needing to specify every module

using debug variant for the vector CA tests, gplay only exists at the…

619ea81

… root level

lifting the activity alias entry to the application module

e9d15b4

- fixes the androidTests expecting a shortcuts xml

ouchadam force-pushed the feature/adm/app-level-variant-v2 branch from 8a6ad06 to e9d15b4 Compare September 15, 2022 13:50

using fully qualified path to test activity, fixes missing reference

60b164a

ouchadam merged commit b05d52b into develop Sep 16, 2022

ouchadam deleted the feature/adm/app-level-variant-v2 branch September 16, 2022 09:36

ouchadam mentioned this pull request Sep 16, 2022

Fix build cache misses #7157

Merged

4 tasks

bmarty mentioned this pull request Sep 19, 2022

Bump android-embedded_fcm_distributor from 2.1.2 to 2.1.3 #7161

Closed

bmarty added a commit that referenced this pull request Sep 19, 2022

Merge pull request #7169 from vector-im/feature/bma/fix_dependencies_…

0fea172

…regression Fix regression on our dependency, due to merge of #6788.

This was referenced Sep 22, 2022

Github Actions build cache usage #5266

Closed

Modularisation - App level variants #6779

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`:vector-app` level variants #6788

`:vector-app` level variants #6788

ouchadam commented Aug 9, 2022 •

edited

Loading

sonarqubecloud bot commented Aug 9, 2022

bmarty left a comment

bmarty Sep 8, 2022

ouchadam Sep 12, 2022 •

edited

Loading

bmarty left a comment

bmarty Sep 12, 2022

ouchadam Sep 12, 2022

bmarty Sep 16, 2022

bmarty Sep 12, 2022

ouchadam Sep 12, 2022

ouchadam Sep 12, 2022

ouchadam Sep 16, 2022

ElementBot commented Sep 15, 2022 •

edited

Loading

sonarqubecloud bot commented Sep 15, 2022

:vector-app level variants #6788

:vector-app level variants #6788

Conversation

ouchadam commented Aug 9, 2022 • edited Loading

Type of change

Content

Motivation and context

Screenshots / GIFs

Tests

Tested devices

sonarqubecloud bot commented Aug 9, 2022

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ouchadam Sep 12, 2022 • edited Loading

Choose a reason for hiding this comment

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ElementBot commented Sep 15, 2022 • edited Loading

sonarqubecloud bot commented Sep 15, 2022

`:vector-app` level variants #6788

`:vector-app` level variants #6788

ouchadam commented Aug 9, 2022 •

edited

Loading

ouchadam Sep 12, 2022 •

edited

Loading

ElementBot commented Sep 15, 2022 •

edited

Loading