Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add android flavor to dartDefines. #2425

Merged
merged 7 commits into from
Nov 26, 2024
Merged

Add android flavor to dartDefines. #2425

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5061dae
Add flavor to dartDefines android.
GChanathip Nov 22, 2024
206326c
update test case
GChanathip Nov 22, 2024
bc67b83
format
GChanathip Nov 22, 2024
ce328a5
Merge branch 'leancodepl:master' into master
GChanathip Nov 23, 2024
b4edb52
Update packages/patrol_cli/lib/src/crossplatform/app_options.dart
GChanathip Nov 26, 2024
3a2cc24
update changelog
GChanathip Nov 26, 2024
2df71f3
remove versioning from changelog
GChanathip Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/patrol_cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.5.0
GChanathip marked this conversation as resolved.
Show resolved Hide resolved

- Add android product flavor to dart-define. (#2425)

## 3.4.0

- Add support for the `patrol_log` package. (#2387)
Expand Down
16 changes: 12 additions & 4 deletions packages/patrol_cli/lib/src/crossplatform/app_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,22 @@ class AndroidAppOptions {
final target = '-Ptarget=${flutter.target}';
cmd.add(target);

// Create modifiable Map
final effectiveDartDefines = Map<String, String>.of(flutter.dartDefines);

// Add flavor to dart defines
if (flutter.flavor case final flavor?) {
effectiveDartDefines['FLUTTER_APP_FLAVOR'] = flavor;
}

// Add Dart defines encoded in base64
if (flutter.dartDefines.isNotEmpty) {
if (effectiveDartDefines.isNotEmpty) {
final dartDefinesString = StringBuffer();
for (var i = 0; i < flutter.dartDefines.length; i++) {
final entry = flutter.dartDefines.entries.elementAt(i);
for (var i = 0; i < effectiveDartDefines.length; i++) {
final entry = effectiveDartDefines.entries.elementAt(i);
final pair = utf8.encode('${entry.key}=${entry.value}');
dartDefinesString.write(base64Encode(pair));
if (i != flutter.dartDefines.length - 1) {
if (i != effectiveDartDefines.length - 1) {
dartDefinesString.write(',');
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/patrol_cli/test/crossplatform/app_options_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void main() {
r'.\gradlew.bat',
':app:assembleDevReleaseAndroidTest',
r'-Ptarget=C:\Users\john\app\integration_test\app_test.dart',
'-Pdart-defines=RU1BSUw9dXNlckBleGFtcGxlLmNvbQ==,UEFTU1dPUkQ9bnk0bmNhdA==,Zm9vPWJhcg==',
'-Pdart-defines=RU1BSUw9dXNlckBleGFtcGxlLmNvbQ==,UEFTU1dPUkQ9bnk0bmNhdA==,Zm9vPWJhcg==,RkxVVFRFUl9BUFBfRkxBVk9SPWRldg==',
'-Papp-server-port=1',
'-Ptest-server-port=2',
]),
Expand Down Expand Up @@ -131,7 +131,7 @@ void main() {
'./gradlew',
':app:assembleDevDebugAndroidTest',
'-Ptarget=/Users/john/app/integration_test/app_test.dart',
'-Pdart-defines=RU1BSUw9dXNlckBleGFtcGxlLmNvbQ==,UEFTU1dPUkQ9bnk0bmNhdA==,Zm9vPWJhcg==',
'-Pdart-defines=RU1BSUw9dXNlckBleGFtcGxlLmNvbQ==,UEFTU1dPUkQ9bnk0bmNhdA==,Zm9vPWJhcg==,RkxVVFRFUl9BUFBfRkxBVk9SPWRldg==',
'-Papp-server-port=1',
'-Ptest-server-port=2',
]),
Expand Down
Loading