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.

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

Compose 1.6 round two #9345

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Conversation

jaynewstrom-stripe
Copy link
Collaborator

@jaynewstrom-stripe jaynewstrom-stripe commented Sep 26, 2024

Summary

Upgrade to Compose 1.6.

The change is split into 3 parts.

  1. Update compose, and fix build issues.
  2. Update dependency baselines (no other changes, just ruby scripts/dependencies/update_transitive_dependencies.rb).
  3. Update screenshots (no other changes, just ./gradlew recordPaparazziDebug).

Dependency update policy proposal here: https://docs.google.com/document/d/1qxLy7LwOI7cKzRS7RoolMAvtu9tti2dmo_CajmUrgdk/edit#heading=h.1an7utgp6hx

Copy link
Contributor

github-actions bot commented Sep 26, 2024

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: V1, V2)
NEW: paymentsheet-example-release-pr.apk (signature: V1, V2)

          │            compressed             │           uncompressed            
          ├───────────┬───────────┬───────────┼───────────┬───────────┬───────────
 APK      │ old       │ new       │ diff      │ old       │ new       │ diff      
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
      dex │   3.9 MiB │     4 MiB │ +26.9 KiB │   8.6 MiB │   8.6 MiB │ +54.1 KiB 
     arsc │   2.3 MiB │   2.3 MiB │ +28.8 KiB │   2.3 MiB │   2.3 MiB │ +28.8 KiB 
 manifest │   5.1 KiB │   5.1 KiB │       0 B │  25.6 KiB │  25.6 KiB │       0 B 
      res │ 933.6 KiB │ 933.8 KiB │    +188 B │   1.5 MiB │   1.5 MiB │    +328 B 
   native │   2.6 MiB │   2.6 MiB │       0 B │     6 MiB │     6 MiB │       0 B 
    asset │   2.9 MiB │   2.9 MiB │    +156 B │   2.9 MiB │   2.9 MiB │    +156 B 
    other │   196 KiB │ 195.9 KiB │     -39 B │ 430.6 KiB │ 430.6 KiB │     -46 B 
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
    total │  12.8 MiB │  12.9 MiB │ +55.9 KiB │  21.7 MiB │  21.8 MiB │ +83.3 KiB 

 DEX     │ old   │ new   │ diff                 
─────────┼───────┼───────┼──────────────────────
   files │     1 │     1 │    0                 
 strings │ 42653 │ 42470 │ -183 (+6620 -6803)   
   types │ 14149 │ 14254 │ +105 (+6169 -6064)   
 classes │ 11775 │ 11867 │  +92 (+5229 -5137)   
 methods │ 60444 │ 61051 │ +607 (+39220 -38613) 
  fields │ 40076 │ 40239 │ +163 (+31260 -31097) 

 ARSC    │ old  │ new  │ diff         
─────────┼──────┼──────┼──────────────
 configs │  242 │  242 │   0          
 entries │ 6252 │ 6271 │ +19 (+24 -5)
APK
      compressed      │     uncompressed      │                                                                         
──────────┬───────────┼───────────┬───────────┤                                                                         
 size     │ diff      │ size      │ diff      │ path                                                                    
──────────┼───────────┼───────────┼───────────┼─────────────────────────────────────────────────────────────────────────
  2.3 MiB │ +28.8 KiB │   2.3 MiB │ +28.8 KiB │ ∆ resources.arsc                                                        
    4 MiB │ +26.9 KiB │   8.6 MiB │ +54.1 KiB │ ∆ classes.dex                                                           
    546 B │    +546 B │   1.1 KiB │  +1.1 KiB │ + res/-81.xml                                                           
          │    -396 B │           │    -500 B │ - res/color/m3_slider_halo_color.xml                                    
    8 KiB │    +128 B │   7.8 KiB │    +128 B │ ∆ assets/dexopt/baseline.prof                                           
    127 B │    +127 B │       5 B │      +5 B │ + META-INF/services/N9.A                                                
    127 B │    +127 B │       5 B │      +5 B │ + META-INF/services/O9.a                                                
          │    -127 B │           │      -5 B │ - META-INF/services/G9.A                                                
          │    -127 B │           │      -5 B │ - META-INF/services/H9.a                                                
 53.4 KiB │     -36 B │ 118.3 KiB │     -23 B │ ∆ META-INF/CERT.SF                                                      
  1,016 B │     +28 B │     884 B │     +28 B │ ∆ assets/dexopt/baseline.profm                                          
    526 B │      +8 B │     840 B │       0 B │ ∆ res/bt.xml                                                            
    551 B │      +7 B │     828 B │    -324 B │ ∆ res/-8.xml                                                            
    541 B │      +4 B │     984 B │       0 B │ ∆ res/J7.xml                                                            
 50.1 KiB │      -4 B │ 118.2 KiB │     -23 B │ ∆ META-INF/MANIFEST.MF                                                  
    303 B │      -3 B │     400 B │       0 B │ ∆ res/OH.xml                                                            
    960 B │      -3 B │   2.7 KiB │       0 B │ ∆ res/ZW.xml                                                            
    450 B │      +3 B │     500 B │       0 B │ ∆ res/color/material_personalized_color_secondary_text_inverse.xml      
    467 B │      -3 B │     844 B │       0 B │ ∆ res/color/wallet_primary_text_holo_light.xml                          
    303 B │      +2 B │     352 B │       0 B │ ∆ res/-5.xml                                                            
    908 B │      +2 B │     2 KiB │       0 B │ ∆ res/2j.xml                                                            
    460 B │      +2 B │     652 B │       0 B │ ∆ res/4I.xml                                                            
    849 B │      +2 B │   1.8 KiB │       0 B │ ∆ res/8Q.xml                                                            
    630 B │      +2 B │     1 KiB │       0 B │ ∆ res/Hc.xml                                                            
    324 B │      -2 B │     388 B │       0 B │ ∆ res/Kt.xml                                                            
  1.1 KiB │      +2 B │   2.7 KiB │       0 B │ ∆ res/L-.xml                                                            
    878 B │      -2 B │   2.3 KiB │       0 B │ ∆ res/YB.xml                                                            
    279 B │      -2 B │     372 B │       0 B │ ∆ res/c6.xml                                                            
    434 B │      -2 B │     500 B │       0 B │ ∆ res/color-v31/m3_dynamic_dark_primary_text_disable_only.xml           
    395 B │      +2 B │     500 B │       0 B │ ∆ res/color/m3_chip_assist_text_color.xml                               
    413 B │      +2 B │     500 B │       0 B │ ∆ res/color/m3_dark_default_color_primary_text.xml                      
    420 B │      +2 B │     500 B │       0 B │ ∆ res/color/m3_dark_default_color_secondary_text.xml                    
    463 B │      +2 B │     668 B │       0 B │ ∆ res/color/m3_icon_button_icon_color_selector.xml                      
    443 B │      +2 B │
...✂
DEX
STRINGS:

   old   │ new   │ diff               
  ───────┼───────┼────────────────────
   42653 │ 42470 │ -183 (+6620 -6803) 
  
  + 
              |
  +  (reason=
  +  in the map
  +  int arguments (
  +  ints and 
  +  object arguments (
  +  objects.
  +  without arguments because it expects 
  + (this)
  + ) and 
  + ) is not null
  + ) is out of bounds [0,
  + ) is out of range. Each dimension must be between 0 and 16777215.
  + ) or end(
  + ), currentThread={id=
  + ), prevOffset=
  + ,
  KeepUntilTransitionsFinished - 
  + , anchor=
  + , applied=
  + , arrangementSpacing=
  + , blendMode=
  + , but was 
  + , converter=
  + , crossAxisSize=
  + , crossed=
  + , disposed=
  + , effectsMap=
  + , enter=
  + , exit=
  + , finishedListener=
  + , graphicsLayerBlock=
  + , handlesCrossed=
  + , hold=
  + , horizontalArrangement=
  + , info=
  
  + , isShowingSubstitution=
  + , layoutCache=
  + , lowestPin=
  + , offsetAnimation=
  + , originalEventPosition=
  + , overrideDescendants=
  + , placementSpec=
  + , platformImeOptions=null)
  + , propagateMinConstraints=
  + , selectableId=
  + , sizeAnimation=
  + , slideAnimation=
  + , spec: 
  + , substitution=
  + , target: 
  + , toDpValues=
  + , verticalArrangement=
  + , visible=
  + ,deviceId=
  + . Not all arguments were provided. Missing 
  + A initializer with the same clazz has already been added: 
  + ARGB_4444
  + AccessibilityKey: 
  + ActiveParent with no focused child
  + Already pushed argument 
  + AnchorInfo(direction=
  + AnimateItemElement(appearanceSpec=
  + AnimationVector3D: v1 = 
  + Array lengths must match and be nonzero
  + Array size not a multiple of 3
  + Asking for intrinsic measurements of SubcomposeLayout layouts is not supported. This includes components that are built on top of SubcomposeLayout, such as lazy lists, BoxWithConstraints, TabRow, etc. To mitigate this:
  - if intrinsic measurements are used to achieve 'match parent' sizing, consider replacing the parent of the component with a custom layout which controls the order in which children are measured, making intrinsic measurement not needed
  - adding a size modifier to the component, in order to fast return the queried intrinsic measurement.
  + AutoMirrored.Filled.KeyboardArrowRight
  + BlendModeColorFilter(color=
  + BoxMeasurePolicy(alignment=
  + Built-in InterruptionHandlingOffset
  + Built-in alpha
  + Built-in scale
  + Built-in shrink/expand
  + Built-in slide
  + COLLAPSED
  + CROSSED
  + Call next() before removing an element.
  + Can only update the current state with MutableTransitionState
  + CancelTraversal
  + Cannot call set before the first call to next() or previous() or immediately after a call to add() or remove()
  + Cannot disable reuse from root if it was caused by other groups
  + Cannot end node insertion, there are no pending operations that can be realized.
  + Cannot find value for key 
  + Cannot pop(), because the stack is empty.
  + Cannot push 
  + Capacity must be a positive value.
  + Clear is not valid on OffsetApplier
  + ClearTextSubstitution
  + Composable 
  + Compose:deactivate
  + Composition is disposed while composing. If dispose is triggered by a call in @Composable function, consider wrapping it with SideEffect block.
  + ContinueTraversal
  + Could not resolve state for movable content
  + D1
  + Deactivated node is focused
  + DensityWithConverter(density=
  + DepthSortedSet.add called on an unattached node
  + DepthSortedSet.remove called on an unattached node
  + Detected multithreaded access to SnapshotStateObserver: previousThreadId=
  + EnterExitTransitionElement(transition=
  + Error attempting to load resource: 
  + Error while pushing 
  + Error: Placement happened before lookahead.
  + Error: currentPostLookaheadIndex cannot be greater than the size of thepostLookaheadComposedSlotIds list.
  + Error: requestLookaheadRemeasure cannot be called on a node outside LookaheadScope
  + ExitTransition.KeepUntilTransitionsFinished
  + Expected AndroidViewHolder to be attached when observing reads.
  + Expected index to be within 0..size()-1, but was 
  + FFFFI
  + FFLL
  + FIII
  + FIZZZ
  + FixupList has pending fixup operations that were not realized. Were there mismatched insertNode() and endNodeInsert() calls?
  + FontScaleConverter{fromSpValues=
  + HorizontalCrossAxisAlignment(horizontal=
  + Hyphens.Unspecified
  + InsetsPaddingValues(insets=
  + IntParameter(
  + IntRef(element = 
  + Invalid root
  + IsShowingTextS
...✂
ARSC
ENTRIES:

   old  │ new  │ diff         
  ──────┼──────┼──────────────
   6252 │ 6271 │ +19 (+24 -5) 
  + attr/indicatorTrackGapSize
  + attr/showMarker
  + attr/thumbHeight
  + attr/thumbTrackGapSize
  + attr/thumbWidth
  + attr/trackInsideCornerSize
  + attr/trackStopIndicatorSize
  + dimen/m3_carousel_small_item_size_min
  + dimen/m3_comp_progress_indicator_active_indicator_track_space
  + dimen/m3_comp_progress_indicator_stop_indicator_size
  + dimen/m3_comp_progress_indicator_track_thickness
  + dimen/m3_comp_scrim_container_opacity
  + dimen/m3_comp_slider_active_handle_height
  + dimen/m3_comp_slider_active_handle_leading_space
  + dimen/m3_comp_slider_active_handle_width
  + dimen/m3_comp_slider_stop_indicator_size
  + drawable/indeterminate_static
  + id/escape
  + id/transition_clip
  + id/transition_image_transform
  + id/transition_pause_alpha
  + string/tooltip_description
  + string/tooltip_label
  + style/Widget.Material3.CircularProgressIndicator.Legacy.ExtraSmall
  
  - color/m3_slider_halo_color
  - dimen/m3_comp_circular_progress_indicator_active_indicator_width
  - dimen/m3_comp_linear_progress_indicator_active_indicator_height
  - dimen/m3_slider_inactive_track_height
  - dimen/m3_slider_thumb_elevation

@jaynewstrom-stripe jaynewstrom-stripe force-pushed the jaynewstrom/compose-1.6-round-two branch 3 times, most recently from f4213cc to 36dcbc2 Compare October 2, 2024 14:13
@jaynewstrom-stripe jaynewstrom-stripe force-pushed the jaynewstrom/compose-1.6-round-two branch 2 times, most recently from 5e73c10 to 81ac999 Compare October 9, 2024 16:32
@jaynewstrom-stripe jaynewstrom-stripe force-pushed the jaynewstrom/compose-1.6-round-two branch 2 times, most recently from d8b4f2d to 04d7454 Compare October 9, 2024 18:38
@jaynewstrom-stripe jaynewstrom-stripe force-pushed the jaynewstrom/compose-1.6-round-two branch from 04d7454 to 33cc5cf Compare October 11, 2024 19:37
@jaynewstrom-stripe jaynewstrom-stripe marked this pull request as ready for review October 11, 2024 19:56
@jaynewstrom-stripe jaynewstrom-stripe requested review from a team as code owners October 11, 2024 19:56
amk-stripe
amk-stripe previously approved these changes Oct 14, 2024
Copy link
Collaborator

@amk-stripe amk-stripe left a comment

Choose a reason for hiding this comment

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

link, paymentsheet, and paymentsheet-example lgtm!

Copy link
Collaborator

@carlosmuvi-stripe carlosmuvi-stripe left a comment

Choose a reason for hiding this comment

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

Looks good on FC! Thanks for doing this 👏

@jaynewstrom-stripe jaynewstrom-stripe enabled auto-merge (squash) October 14, 2024 19:40
@jaynewstrom-stripe jaynewstrom-stripe force-pushed the jaynewstrom/compose-1.6-round-two branch from 33cc5cf to 6cb1c9d Compare October 16, 2024 13:41
Copy link
Collaborator

@awush-stripe awush-stripe left a comment

Choose a reason for hiding this comment

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

cardscan changes are fine by me!

Copy link
Contributor

@simond-stripe simond-stripe left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@jaynewstrom-stripe jaynewstrom-stripe merged commit 2265d85 into master Oct 16, 2024
17 checks passed
@jaynewstrom-stripe jaynewstrom-stripe deleted the jaynewstrom/compose-1.6-round-two branch October 16, 2024 19:15
amk-stripe pushed a commit that referenced this pull request Oct 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants