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

Manual roll Flutter from 911aa7547ed7 to 043b71954ce7 #8693

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+22 −27
Open

Manual roll Flutter from 911aa7547ed7 to 043b71954ce7 #8693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cfb236
Roll master
stuartmorgan Feb 24, 2025
7787e9f
Bump androidx.test:core to at least 1.4.0 across the repo
stuartmorgan Feb 24, 2025
c0f3a6b
Don't force integration test plugin dependency
stuartmorgan Feb 24, 2025
d02abdf
Remove accidentally added annotation
stuartmorgan Feb 24, 2025
860339f
No need to store the engine
stuartmorgan Feb 24, 2025
0ee396c
Try making deps non-dev in camera
stuartmorgan Feb 25, 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
4 changes: 2 additions & 2 deletions packages/camera/camera/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ dependencies:
path: ../
flutter:
sdk: flutter
integration_test:
sdk: flutter
path_provider: ^2.0.0
video_player: ^2.7.0

Expand All @@ -25,8 +27,6 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
integration_test:
sdk: flutter
leak_tracker_flutter_testing: any

flutter:
Expand Down
4 changes: 2 additions & 2 deletions packages/camera/camera_android/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ dependencies:
camera_platform_interface: ^2.6.0
flutter:
sdk: flutter
integration_test:
sdk: flutter
path_provider: ^2.0.0
video_player: ^2.7.0

Expand All @@ -26,8 +28,6 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
integration_test:
sdk: flutter

flutter:
uses-material-design: true
5 changes: 2 additions & 3 deletions packages/camera/camera_android_camerax/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ dependencies:
camera_platform_interface: ^2.6.0
flutter:
sdk: flutter
integration_test:
sdk: flutter
video_player: ^2.7.0

dev_dependencies:
espresso: ^0.4.0
flutter_test:
sdk: flutter
integration_test:
sdk: flutter

flutter:
uses-material-design: true

2 changes: 0 additions & 2 deletions packages/camera/camera_android_camerax/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ dev_dependencies:
build_runner: ^2.2.0
flutter_test:
sdk: flutter
integration_test:
sdk: flutter
leak_tracker_flutter_testing: any
mockito: ^5.4.4
pigeon: ^9.1.0
Expand Down
2 changes: 1 addition & 1 deletion packages/file_selector/file_selector_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
implementation 'androidx.annotation:annotation:1.9.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.1.0'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation "org.robolectric:robolectric:4.12.1"
}

Expand Down
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
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ android {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
testImplementation 'com.google.android.gms:play-services-maps:17.0.0'
}
namespace 'io.flutter.plugins.googlemapsexample'
Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'androidx.test:core:1.2.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation "org.robolectric:robolectric:4.10.3"
}

Expand Down
2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ android {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
testImplementation 'com.google.android.gms:play-services-maps:17.0.0'
testImplementation 'com.google.maps.android:android-maps-utils:3.6.0'
}
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ dependencies {
testImplementation'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ dependencies {
testImplementation'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
2 changes: 1 addition & 1 deletion packages/interactive_media_ads/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {
testImplementation 'org.jetbrains.kotlin:kotlin-test'
testImplementation "org.mockito.kotlin:mockito-kotlin:5.4.0"
testImplementation 'org.mockito:mockito-inline:5.1.0'
testImplementation 'androidx.test:core:1.3.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI I filed flutter/flutter#164025 to track making these updates easier.

testImplementation 'androidx.test:core:1.4.0'
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/quick_actions/quick_actions/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
3 changes: 1 addition & 2 deletions packages/quick_actions/quick_actions_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

def androidXTestVersion = '1.2.0'
def androidXTestVersion = '1.4.0'

android {
namespace 'io.flutter.plugins.quickactionsexample'
Expand Down Expand Up @@ -54,7 +54,6 @@ flutter {

dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api "androidx.test:core:$androidXTestVersion"

Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ dependencies {
implementation 'androidx.browser:browser:1.8.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'androidx.test:core:1.0.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation 'org.robolectric:robolectric:4.10.3'
}
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
implementation "androidx.media3:media3-exoplayer-rtsp:${exoplayer_version}"
implementation "androidx.media3:media3-exoplayer-smoothstreaming:${exoplayer_version}"
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'androidx.test:core:1.4.0'
testImplementation 'org.mockito:mockito-inline:5.0.0'
testImplementation 'org.robolectric:robolectric:4.10.3'
testImplementation "androidx.media3:media3-test-utils:${exoplayer_version}"
Expand Down
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
implementation 'androidx.webkit:webkit:1.12.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-inline:5.1.0'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'androidx.test:core:1.4.0'
}

testOptions {
Expand Down