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

Fix androidx.lifecycle dependencies #4966

Merged
merged 1 commit into from
May 6, 2022
Merged

Conversation

brnunes-stripe
Copy link
Contributor

@brnunes-stripe brnunes-stripe commented May 5, 2022

Summary

Depending on androidx.navigation 2.5.0-beta01 was pulling androidx.lifecycle 2.5.0-beta01, which requires the -Xjvm-default compiler argument and was causing issues.
Revert to 2.4.2, add dependency to androidx.lifecycle:lifecycle-runtime-ktx so we can keep using repeatOnLifecycle, flowWithLifecycle.

Motivation

Fix #4933, #4922, #4960 (hopefully)

@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2022

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: none)
NEW: paymentsheet-example-release-pr.apk (signature: none)

          │            compressed             │           uncompressed            
          ├───────────┬───────────┬───────────┼──────────┬───────────┬────────────
 APK      │ old       │ new       │ diff      │ old      │ new       │ diff       
──────────┼───────────┼───────────┼───────────┼──────────┼───────────┼────────────
      dex │  13.7 MiB │  13.7 MiB │   -36 KiB │ 45.8 MiB │  45.7 MiB │ -114.8 KiB 
     arsc │   1.7 MiB │   1.7 MiB │    +192 B │  1.7 MiB │   1.7 MiB │     +192 B 
 manifest │   3.4 KiB │   3.4 KiB │       0 B │ 15.2 KiB │  15.2 KiB │        0 B 
      res │ 714.7 KiB │ 715.4 KiB │    +677 B │  1.1 MiB │   1.1 MiB │     +984 B 
   native │   5.4 MiB │   5.4 MiB │       0 B │ 13.4 MiB │  13.4 MiB │        0 B 
    asset │     3 MiB │     3 MiB │    -977 B │    3 MiB │     3 MiB │     -977 B 
    other │    80 KiB │  79.9 KiB │    -155 B │  155 KiB │ 154.7 KiB │     -231 B 
──────────┼───────────┼───────────┼───────────┼──────────┼───────────┼────────────
    total │  24.5 MiB │  24.5 MiB │ -36.3 KiB │ 65.2 MiB │  65.1 MiB │ -114.8 KiB 

         │           raw           │               unique                
         ├────────┬────────┬───────┼────────┬────────┬───────────────────
 DEX     │ old    │ new    │ diff  │ old    │ new    │ diff              
─────────┼────────┼────────┼───────┼────────┼────────┼───────────────────
   files │      4 │      4 │     0 │        │        │                   
 strings │ 222689 │ 221806 │  -883 │ 194311 │ 193811 │ -500 (+266 -766)  
   types │  38963 │  38702 │  -261 │  35659 │  35459 │ -200 (+55 -255)   
 classes │  32993 │  32796 │  -197 │  32993 │  32796 │ -197 (+55 -252)   
 methods │ 199444 │ 198320 │ -1124 │ 191793 │ 190980 │ -813 (+210 -1023) 
  fields │ 147568 │ 147553 │   -15 │ 146577 │ 146569 │   -8 (+206 -214)  

 ARSC    │ old  │ new  │ diff       
─────────┼──────┼──────┼────────────
 configs │  292 │  292 │  0         
 entries │ 5841 │ 5846 │ +5 (+6 -1)
APK
      compressed      │      uncompressed      │                                                                      
──────────┬───────────┼───────────┬────────────┤                                                                      
 size     │ diff      │ size      │ diff       │ path                                                                 
──────────┼───────────┼───────────┼────────────┼──────────────────────────────────────────────────────────────────────
 92.1 KiB │   -67 KiB │ 224.7 KiB │ -148.6 KiB │ ∆ classes4.dex                                                       
  3.8 MiB │ +18.6 KiB │  11.3 MiB │  +46.8 KiB │ ∆ classes3.dex                                                       
  3.3 MiB │  +6.8 KiB │   8.8 MiB │    -22 KiB │ ∆ classes2.dex                                                       
  6.5 MiB │  +5.5 KiB │  25.3 MiB │   +8.9 KiB │ ∆ classes.dex                                                        
  6.7 KiB │    -977 B │   6.5 KiB │     -977 B │ ∆ assets/dexopt/baseline.prof                                        
    330 B │    +330 B │     492 B │     +492 B │ + res/SO.xml                                                         
    330 B │    +330 B │     492 B │     +492 B │ + res/si.xml                                                         
  1.7 MiB │    +192 B │   1.7 MiB │     +192 B │ ∆ resources.arsc                                                     
  4.4 KiB │     -29 B │  13.8 KiB │     -105 B │ ∆ kotlin/kotlin.kotlin_builtins                                      
    184 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.activity_activity-compose.version                
    176 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.activity_activity-ktx.version                    
    168 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.activity_activity.version                        
    152 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.core_core.version                                
    200 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-livedata-core.version        
    196 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-runtime-ktx.version          
    188 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-runtime.version              
    208 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-viewmodel-compose.version    
    200 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-viewmodel-ktx.version        
    214 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.version 
    192 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.lifecycle_lifecycle-viewmodel.version            
    198 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.navigation_navigation-common-ktx.version         
    190 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.navigation_navigation-common.version             
    192 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.navigation_navigation-compose.version            
    200 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.navigation_navigation-runtime-ktx.version        
    192 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.navigation_navigation-runtime.version            
    184 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.savedstate_savedstate-ktx.version                
    176 B │      -7 B │       6 B │       -7 B │ ∆ META-INF/androidx.savedstate_savedstate.version                    
    883 B │      -3 B │   2.4 KiB │        0 B │ ∆ res/C7.xml                                                         
    434 B │      -3 B │     816 B │        0 B │ ∆ res/dV.xml                                                         
  1.1 KiB │      +2 B │   2.9 KiB │        0 B │ ∆ res/5d.xml                                                         
  1.1 KiB │      +2 B │   3.1 KiB │        0 B │ ∆ res/FR.xml                                                         
    1 KiB │      +2 B │   3.1 KiB │        0 B │ ∆ res/Fs.xml                                                         
    799 B │      +2 B │   1.8 KiB │        0 B │ ∆ res/Qc.xml                                                         
    541 B │      +2 B │     952 B │        0 B │ ∆ res/a2.xml                                    
...✂
DEX
STRINGS:

   old    │ new    │ diff             
  ────────┼────────┼──────────────────
   194311 │ 193811 │ -500 (+266 -766) 
  + �
  
  ��������0�H
  
  + 	
  
  ���*���������H�����H�0����������H
  
  + 
  
  
  ���
  ������0����������2����
   �*���H�H�H
  
  + �
  
  ���
  ���
  ������0�����2�������0�H
  
  + �
  
  ���
  
  ���
  ���
  ���
  ������0�2����
   �*���0�0�2�����0�2�����0�2�����0�2��	��0�2��
  ��0�2�����0�2����0�2��
  ��0�H
  
  + �
  
  ���
  
  ���
  ���
  
  ���
  ���
  �4�������H�0�
  �����*�0�*�0�2��
  ���
  ����0���0�H��ø����
  ���20�¨��
  + 2
  ���
  ���
  ���
  ���
  ���
  ���
  
  ���
  ���
  ���
  ���
  ���
  ������2�����0�������0�0�B�¢����J�����0�2�����0�2��	��0�H�J �
  �������0���0�2�����0�2��	��0�J������0�2��
  ��0�2�������0�¨��
  + _this_trackPipAnimationHintView_inlined
  + >;>;Z)V
  + Bitmap must not be null.
  + C(BackHandler)78@3169L28,80@3299L171,88@3571L48,88@3560L59,*91@3692L7,94@3871L7,95@3883L302:BackHandler.kt#q1dkbc
  + C46@1881L7,*47@1957L7:BackHandler.kt#q1dkbc
  + Data must not be null.
  + ImplApi23
  + ImplApi29
  + Landroidx/activity/PipHintTrackerKt_trackPipAnimationHintView__inlined_collect_1;
  + Landroidx/activity/PipHintTrackerKt_trackPipAnimationHintView_flow_1_layoutChangeListener_1;
  + Landroidx/activity/PipHintTrackerKt_trackPipAnimationHintView_flow_1_scrollChangeListener_1;
  + Landroidx/activity/compose/ActivityResultRegistryKt_rememberLauncherForActivityResult_1_1;
  + Landroidx/activity/result/ActivityResultCallerKt_registerForActivityResult_resultLauncher_1;
  + Landroidx/activity/result/ActivityResultCallerKt_registerForActivityResult_resultLauncher_2;
  + Landroidx/core/R_menu;
  + Landroidx/core/app/ActivityCompat_2;
  + Landroidx/core/app/ActivityCompat_SharedElementCallback21Impl_1;
  + Landroidx/core/app/BundleCompat_BundleCompatBaseImpl;
  + Landroidx/core/content/res/ResourcesCompat_FontCallback_1;
  + Landroidx/core/content/res/ResourcesCompat_FontCallback_2;
  + Landroidx/core/content/res/ResourcesCompat_ImplApi29;
  + Landroidx/core/content/res/ResourcesCompat_ThemeCompat_ImplApi23;
  + Landroidx/core/content/res/ResourcesCompat_ThemeCompat_ImplApi29;
  + Landroidx/core/location/LocationManagerCompat_1;
  + Landroidx/core/location/LocationManagerCompat_CancellableLocationListener_1;
  + Landroidx/core/location/LocationManagerCompat_LocationListenerTransport__ExternalSyntheticLambda6;
  + Landroidx/core/location/LocationManagerCompat_LocationListenerTransport__ExternalSyntheticLambda7;
  + Package must not be null.
  + RemoteInput
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_CreateDocument
  + 2 fake.kt
  kotlin/jvm/internal/FakeKt
  *L
  1#1,588:1
  1#2:589
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_GetContent
  + 2 fake.kt
  kotlin/jvm/internal/FakeKt
  *L
  1#1,588:1
  1#2:589
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_OpenDocument
  + 2 fake.kt
  kotlin/jvm/internal/FakeKt
  *L
  1#1,588:1
  1#2:589
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_OpenDocumentTree
  + 2 fake.kt
  kotlin/jvm/internal/FakeKt
  *L
  1#1,588:1
  1#2:589
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_PickContact
  + 2 fake.kt
  kotlin/jvm/internal/FakeKt
  *L
  1#1,588:1
  1#2:589
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_RequestMultiplePermissions
  + 2 _Arrays.kt
  kotlin/collections/ArraysKt___ArraysKt
  *L
  1#1,588:1
  12530#2,2:589
  8669#2,2:591
  9351#2,4:593
  11358#2:597
  11693#2,3:598
  *S KotlinDebug
  *F
  + 1 ActivityResultContracts.kt
  androidx/activity/result/contract/ActivityResultContracts_RequestMultiplePermissions
  *L
  179#1:589,2
  186#1:591,2
  186#1:593,4
  199#1:597
  199#1:598,3
  *E
  
  + SMAP
  ActivityResultContracts.kt
  Kotlin
  *S Kotlin
  *F
  + 1 ActivityResultContracts.kt
  androidx/activ
...✂
ARSC
ENTRIES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   5841 │ 5846 │ +5 (+6 -1) 
  + id/item1
  + id/item2
  + id/item3
  + id/item4
  + menu/example_menu
  + menu/example_menu2
  
  - id/view_tree_on_back_pressed_dispatcher_owner

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.

Showing Error in ViewModelProvider Factory class after upgrading from 20.0.0 to 20.2.0
4 participants