[camera_android] Upgrading roboelectric from 4.5 to 4.10.3 #4018

gmackall · 2023-05-16T17:24:07Z

flutter/flutter#119752

Upgrades to allow configurations of sdk >= 31 (4.8.1 was chosen as it is the most common version used in other packages).

Pre-launch Checklist

flutter-dashboard · 2023-05-16T17:24:10Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

camsim99 · 2023-06-07T19:55:18Z

packages/camera/camera_android/android/build.gradle

@@ -51,6 +51,7 @@ android {
        unitTests.includeAndroidResources = true
        unitTests.returnDefaultValues = true
        unitTests.all {
+            jvmArgs "-Xmx1g"


Bumped to fix OOM errors.

camsim99 · 2023-06-07T19:55:32Z

...mera_android/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java

@@ -92,7 +92,6 @@ public MediaRecorder build() throws IOException, NullPointerException, IndexOutO
      mediaRecorder.setVideoEncodingBitRate(videoProfile.getBitrate());
      mediaRecorder.setVideoFrameRate(videoProfile.getFrameRate());
      mediaRecorder.setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());
-      mediaRecorder.setVideoSize(videoProfile.getWidth(), videoProfile.getHeight());


Unrelated fix: remove duplicate line

camsim99 · 2023-06-07T19:56:35Z

...droid/src/test/java/io/flutter/plugins/camera/features/resolution/ResolutionFeatureTest.java

-    List<EncoderProfiles.VideoProfile> mockVideoProfilesList = List.of(mockVideoProfile);
+    List<EncoderProfiles.VideoProfile> mockVideoProfilesList =
+        new ArrayList<EncoderProfiles.VideoProfile>();
+    mockVideoProfilesList.add(null);


The EncoderProfiles.VideoProfile class is final static so it cannot be mocked. It's not actually tested in this test so I just set it to null so that the tests run properly.

camsim99 · 2023-06-07T19:57:00Z

...droid/src/test/java/io/flutter/plugins/camera/features/resolution/ResolutionFeatureTest.java

@@ -386,7 +385,7 @@ public void computeBestPreviewSize_shouldUseLegacyBehaviorWhenEncoderProfilesNul
  @Config(minSdk = 31)
  @Test
  public void resolutionFeatureShouldUseLegacyBehaviorWhenEncoderProfilesNull() {
-    beforeLegacy();
+    before();


This tests non-legacy code so this was incorrect I think.

camsim99 · 2023-06-07T19:58:52Z

This is a test-only change except for an unrelated fix, so I added a NEXT entry. Let me know if I need to actually do a version bump.

stuartmorgan

LGTM with one question. I'm fine with not releasing the duplicate line removal since while it technically changes runtime behavior, it's hard to imagine it being anything but a no-op in effect.

stuartmorgan · 2023-06-07T21:13:59Z

packages/camera/camera_android/android/gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx16Gheheheheheh


What's the heheheheheh?

This was a test to see if I could change the heap size this way. It didn't impact anything and I forgot to remove it -- oops!

gmackall · 2023-06-15T16:03:30Z

I am not able to approve (because I am the "author", despite your changes being the majority @camsim99 ) but this LGTM!

…lutter/packages#4018)

flutter/packages@f9314a3...59d93d6 2023-06-16 [email protected] [tool] Add command aliases (flutter/packages#4207) 2023-06-16 [email protected] [google_map_flutter] Fix map object regression due to async changes (flutter/packages#4171) 2023-06-16 [email protected] [url_launcher] Add ignores for deprecated member to test (flutter/packages#4220) 2023-06-15 [email protected] Roll Flutter from 95be76a to b0188cd (10 revisions) (flutter/packages#4221) 2023-06-15 [email protected] [camera_android] Upgrading roboelectric from 4.5 to 4.10.3 (flutter/packages#4018) 2023-06-15 [email protected] [go_router] Fixes bug that GoRouterState in top level redirect doesn'â�¦ (flutter/packages#4173) 2023-06-15 [email protected] [go_router]Updates documentations around GoRouter.of, GoRouter.maybeOf, and BuildContext extension. (flutter/packages#4176) 2023-06-15 [email protected] [tool] Support code excerpts for any .md file (flutter/packages#4212) 2023-06-15 [email protected] [webview_flutter] Add support for limitsNavigationsToAppBoundDomains (flutter/packages#4026) 2023-06-15 [email protected] [webview_flutter][webview_flutter_android] Add android support for handling geolocation permissions (flutter/packages#3795) 2023-06-15 [email protected] [image_picker] add getMedia method (flutter/packages#3892) 2023-06-15 [email protected] [image_picker] getMedia platform implementations (flutter/packages#4175) 2023-06-14 [email protected] Ignore `textScaleFactor` deprecation (flutter/packages#4209) 2023-06-14 [email protected] [pigeon] Enable Obj-C integration tests in CI (flutter/packages#4215) 2023-06-14 [email protected] [flutter_adaptive_scaffold] Support RTL (flutter/packages#4204) 2023-06-14 [email protected] Manual roll Flutter from 09b7e56 to 95be76a (14 revisions) (flutter/packages#4214) 2023-06-14 [email protected] Roll Flutter (stable) from 682aa38 to 796c8ef (5 revisions) (flutter/packages#4213) 2023-06-14 [email protected] Roll Flutter from 353b8bc to 09b7e56 (17 revisions) (flutter/packages#4206) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

upgrading roboelectric

451505d

gmackall requested a review from camsim99 as a code owner May 16, 2023 17:24

flutter-dashboard bot added the needs tests label May 16, 2023

gmackall marked this pull request as draft May 16, 2023 17:24

github-actions bot added p: camera platform-android labels May 16, 2023

camsim99 added 18 commits June 5, 2023 09:53

Merge remote-tracking branch 'upstream/main' into camera_roboelectric

54534e0

Merge remote-tracking branch 'upstream/main' into camera_roboelectric

b87408b

Try mockStatic for encoderProfiles

5f14861

Fix fix for encoder profiles

041fc97

Try adding gradle properties

0afa57a

Bump both jvmargs for test

2cc831c

Change constructors for encoderprofile subclasses and bump heap size

b7710d2

Fix before call

3eaf0b4

Undo change to example, test gradle.properties

ae75de2

Merge remote-tracking branch 'upstream/main' into camera_roboelectric

051eb23

Undo wrong heap size

4e8254a

Try modifying linux memory

5f4af40

try adding more heap space in gradle file

57c66bb

Empty commit for test

7021ee8

Try 1 gig

8dbfb2a

Merge remote-tracking branch 'upstream/main' into camera_roboelectric

cf705fd

Formatting

2024f1f

Bump to 4.10.3 and add next entry for mediarecorderbuilder change

442acd7

camsim99 reviewed Jun 7, 2023

View reviewed changes

camsim99 changed the title ~~[camera_android] Upgrading roboelectric from 4.5 to 4.8.1~~ [camera_android] Upgrading roboelectric from 4.5 to 4.10.3 Jun 7, 2023

camsim99 marked this pull request as ready for review June 7, 2023 19:58

camsim99 requested review from stuartmorgan and bparrishMines June 7, 2023 19:59

stuartmorgan approved these changes Jun 7, 2023

View reviewed changes

stuartmorgan added the override: no versioning needed Override the check requiring version bumps for most changes label Jun 7, 2023

Remove test

ba936a8

camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 15, 2023

auto-submit bot merged commit 94706c8 into flutter:main Jun 15, 2023

engine-flutter-autoroll mentioned this pull request Jun 16, 2023

Roll Packages from f9314a3b833a to 59d93d64cb83 (18 revisions) flutter/flutter#129014

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 16, 2023

94706c8 [camera_android] Upgrading roboelectric from 4.5 to 4.10.3 (f…

2f72c4d

…lutter/packages#4018)

engine-flutter-autoroll mentioned this pull request Jun 16, 2023

Roll Packages from f9314a3b833a to 59d93d64cb83 (18 revisions) flutter/flutter#129021

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 16, 2023

94706c8 [camera_android] Upgrading roboelectric from 4.5 to 4.10.3 (f…

4c33443

…lutter/packages#4018)

gmackall mentioned this pull request Jun 16, 2023

[camera_android] Bump robolectric version to allow configurations for SDK >= 31 flutter/flutter#119752

Closed

This was referenced Jul 7, 2023

[Tool] New tool to download android dependencies #4408

Merged

[camera] tree fix format 2023 05 12 #4450

Closed

[tooling] mark infra steps as infra steps in yaml files #4473

Merged

reidbaker mentioned this pull request Jul 26, 2023

[Tooling] Add google owned cache for dependencies as an option in ci #4567

Merged

11 tasks

reidbaker mentioned this pull request Aug 4, 2023

[All] Expand artifact hub to all plugins #4645

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[camera_android] Upgrading roboelectric from 4.5 to 4.10.3 #4018

[camera_android] Upgrading roboelectric from 4.5 to 4.10.3 #4018

gmackall commented May 16, 2023 •

edited by camsim99

Loading

flutter-dashboard bot commented May 16, 2023

camsim99 Jun 7, 2023

camsim99 Jun 7, 2023

camsim99 Jun 7, 2023 •

edited

Loading

camsim99 Jun 7, 2023

camsim99 commented Jun 7, 2023

stuartmorgan left a comment

stuartmorgan Jun 7, 2023

camsim99 Jun 7, 2023

gmackall commented Jun 15, 2023

		@@ -0,0 +1 @@
		org.gradle.jvmargs=-Xmx16Gheheheheheh

[camera_android] Upgrading roboelectric from 4.5 to 4.10.3 #4018

[camera_android] Upgrading roboelectric from 4.5 to 4.10.3 #4018

Conversation

gmackall commented May 16, 2023 • edited by camsim99 Loading

Pre-launch Checklist

flutter-dashboard bot commented May 16, 2023

camsim99 Jun 7, 2023

Choose a reason for hiding this comment

camsim99 Jun 7, 2023

Choose a reason for hiding this comment

camsim99 Jun 7, 2023 • edited Loading

Choose a reason for hiding this comment

camsim99 Jun 7, 2023

Choose a reason for hiding this comment

camsim99 commented Jun 7, 2023

stuartmorgan left a comment

Choose a reason for hiding this comment

stuartmorgan Jun 7, 2023

Choose a reason for hiding this comment

camsim99 Jun 7, 2023

Choose a reason for hiding this comment

gmackall commented Jun 15, 2023

gmackall commented May 16, 2023 •

edited by camsim99

Loading

camsim99 Jun 7, 2023 •

edited

Loading