Skip to content

Manual roll Flutter from 911aa7547ed7 to 043b71954ce7 #8693

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

Merged
merged 10 commits into from
Feb 27, 2025
Merged

Manual roll Flutter from 911aa7547ed7 to 043b71954ce7 #8693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7cfb236
Roll master
stuartmorgan-g Feb 24, 2025
7787e9f
Bump androidx.test:core to at least 1.4.0 across the repo
stuartmorgan-g Feb 24, 2025
c0f3a6b
Don't force integration test plugin dependency
stuartmorgan-g Feb 24, 2025
d02abdf
Remove accidentally added annotation
stuartmorgan-g Feb 24, 2025
860339f
No need to store the engine
stuartmorgan-g Feb 24, 2025
0ee396c
Try making deps non-dev in camera
stuartmorgan-g Feb 25, 2025
4cfbe0f
Revert "Try making deps non-dev in camera"
stuartmorgan-g Feb 25, 2025
bfc6ce5
Force release build config
stuartmorgan-g Feb 25, 2025
2ad8dac
Merge branch 'main' into manual-roll-043b71954ce7
stuartmorgan-g Feb 26, 2025
617dcde
Merge branch 'main' into manual-roll-043b71954ce7
stuartmorgan-g Feb 26, 2025
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
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
911aa7547ed732052f98b79f7b1584bd137bda43
043b71954ce73f727f3cb6f5ccd549cc005b1310
3 changes: 1 addition & 2 deletions ...c/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import android.util.Log;
import androidx.lifecycle.Lifecycle;
import dev.flutter.plugins.integration_test.IntegrationTestPlugin;
import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
Expand All @@ -19,8 +18,8 @@ public class MainActivity extends FlutterActivity {

@Override
public void configureFlutterEngine(FlutterEngine flutterEngine) {
super.configureFlutterEngine(flutterEngine);
flutterEngine.getPlugins().add(new TestPlugin());
flutterEngine.getPlugins().add(new IntegrationTestPlugin());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we not need the integration test plugin? was it dead code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a speculative change, but the fact that this wasn't calling super seems suspicious. Normally plugins are registered by the generated registrant.

This wasn't compiling because it's unconditionally using the integration test plugin, but that plugin is a dev dependency. If this doesn't work, I'll need to make this example app have a non-dev dependency on it instead, but that feels wrong.

}

private static class TestPlugin implements FlutterPlugin, ActivityAware {
Expand Down
33 changes: 17 additions & 16 deletions script/tool/lib/src/firebase_test_lab_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,22 +245,23 @@ class FirebaseTestLabCommand extends PackageLoopingCommand {
///
/// Returns true if either gradlew was already present, or the build succeeds.
Future<bool> _ensureGradleWrapperExists(GradleProject project) async {
if (!project.isConfigured()) {
print('Running flutter build apk...');
final String experiment = getStringArg(kEnableExperiment);
final int exitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
'apk',
'--config-only',
if (experiment.isNotEmpty) '--enable-experiment=$experiment',
],
workingDir: project.androidDirectory);

if (exitCode != 0) {
return false;
}
// Unconditionally re-run build with --debug --config-only, to ensure that
// the project is in a debug state even if it was previously configured.
print('Running flutter build apk...');
final String experiment = getStringArg(kEnableExperiment);
final int exitCode = await processRunner.runAndStream(
flutterCommand,
<String>[
'build',
'apk',
'--debug',
'--config-only',
if (experiment.isNotEmpty) '--enable-experiment=$experiment',
],
workingDir: project.androidDirectory);

if (exitCode != 0) {
return false;
}
return true;
}
Expand Down
46 changes: 44 additions & 2 deletions script/tool/test/firebase_test_lab_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,14 @@ public class MainActivityTest {
expect(
processRunner.recordedCalls,
orderedEquals(<ProcessCall>[
ProcessCall(
'flutter',
const <String>['build', 'apk', '--debug', '--config-only'],
plugin1
.getExamples()
.first
.platformDirectory(FlutterPlatform.android)
.path),
ProcessCall(
'gcloud',
'auth activate-service-account --key-file=/path/to/key'
Expand All @@ -185,6 +193,14 @@ public class MainActivityTest {
'firebase test android run --type instrumentation --app build/app/outputs/apk/debug/app-debug.apk --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk --timeout 7m --results-bucket=gs://a_bucket --results-dir=plugins_android_test/plugin1/buildId/testRunId/example/0/ --device model=redfin,version=30 --device model=seoul,version=26'
.split(' '),
'/packages/plugin1/example'),
ProcessCall(
'flutter',
const <String>['build', 'apk', '--debug', '--config-only'],
plugin2
.getExamples()
.first
.platformDirectory(FlutterPlatform.android)
.path),
ProcessCall(
'/packages/plugin2/example/android/gradlew',
'app:assembleAndroidTest -Pverbose=true'.split(' '),
Expand Down Expand Up @@ -245,6 +261,14 @@ public class MainActivityTest {
expect(
processRunner.recordedCalls,
orderedEquals(<ProcessCall>[
ProcessCall(
'flutter',
const <String>['build', 'apk', '--debug', '--config-only'],
plugin
.getExamples()
.first
.platformDirectory(FlutterPlatform.android)
.path),
ProcessCall(
'/packages/plugin/example/android/gradlew',
'app:assembleAndroidTest -Pverbose=true'.split(' '),
Expand Down Expand Up @@ -669,8 +693,12 @@ class MainActivityTest {
orderedEquals(<ProcessCall>[
ProcessCall(
'flutter',
'build apk --config-only'.split(' '),
'/packages/plugin/example/android',
'build apk --debug --config-only'.split(' '),
plugin
.getExamples()
.first
.platformDirectory(FlutterPlatform.android)
.path,
),
ProcessCall(
'/packages/plugin/example/android/gradlew',
Expand Down Expand Up @@ -841,6 +869,20 @@ class MainActivityTest {
expect(
processRunner.recordedCalls,
orderedEquals(<ProcessCall>[
ProcessCall(
'flutter',
const <String>[
'build',
'apk',
'--debug',
'--config-only',
'--enable-experiment=exp1'
],
plugin
.getExamples()
.first
.platformDirectory(FlutterPlatform.android)
.path),
ProcessCall(
'/packages/plugin/example/android/gradlew',
'app:assembleAndroidTest -Pverbose=true -Pextra-front-end-options=--enable-experiment%3Dexp1 -Pextra-gen-snapshot-options=--enable-experiment%3Dexp1'
Expand Down