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

Use Compose BOM for Compose related dependencies #6676

Merged
merged 6 commits into from
May 5, 2023

Conversation

carlosmuvi-stripe
Copy link
Collaborator

@carlosmuvi-stripe carlosmuvi-stripe commented May 4, 2023

Summary

Motivation

Testing

  • Added tests
  • Modified tests
  • Manually verified

@github-actions
Copy link
Contributor

github-actions bot commented May 4, 2023

Risky Change

This is considered a risky change because it adjusts the sample app build.gradle, please review carefully.
We've seen issues in the past which resulted in failed builds for merchants. Please make sure the build.gradle change is intended.

By adding the label accept-risky-change to this PR, I acknowledge that I'm changing an example app and have verified that the SDK remains in a shippable state.

@carlosmuvi-stripe carlosmuvi-stripe changed the title Updates Compose to 1.4.3 Use Compose BOM for Compose related dependencies May 4, 2023
@carlosmuvi-stripe carlosmuvi-stripe added the accept-risky-change accept-risky-change label May 4, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 4, 2023

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.4 MiB │   3.4 MiB │ +737 B │   7.4 MiB │   7.4 MiB │ +2.6 KiB 
     arsc │   2.1 MiB │   2.1 MiB │    0 B │   2.1 MiB │   2.1 MiB │      0 B 
 manifest │   4.6 KiB │   4.6 KiB │   -2 B │  22.3 KiB │  22.3 KiB │      0 B 
      res │ 869.1 KiB │ 869.1 KiB │    0 B │   1.3 MiB │   1.3 MiB │      0 B 
   native │   2.6 MiB │   2.6 MiB │    0 B │     6 MiB │     6 MiB │      0 B 
    asset │     3 MiB │     3 MiB │   +7 B │     3 MiB │     3 MiB │     +7 B 
    other │ 199.6 KiB │ 199.7 KiB │  +49 B │ 446.8 KiB │ 446.8 KiB │      0 B 
──────────┼───────────┼───────────┼────────┼───────────┼───────────┼──────────
    total │  12.1 MiB │  12.1 MiB │ +791 B │  20.3 MiB │  20.3 MiB │ +2.6 KiB 

 DEX     │ old   │ new   │ diff             
─────────┼───────┼───────┼──────────────────
   files │     1 │     1 │  0               
 strings │ 36230 │ 36237 │ +7 (+26 -19)     
   types │ 12030 │ 12029 │ -1 (+12 -13)     
 classes │ 10141 │ 10140 │ -1 (+3 -4)       
 methods │ 53658 │ 53662 │ +4 (+1036 -1032) 
  fields │ 34113 │ 34110 │ -3 (+613 -616)   

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  291 │  291 │  0   
 entries │ 6942 │ 6942 │  0
APK
    compressed     │     uncompressed     │                                
──────────┬────────┼───────────┬──────────┤                                
 size     │ diff   │ size      │ diff     │ path                           
──────────┼────────┼───────────┼──────────┼────────────────────────────────
  3.4 MiB │ +737 B │   7.4 MiB │ +2.6 KiB │ ∆ classes.dex                  
 48.5 KiB │  +35 B │ 140.8 KiB │      0 B │ ∆ META-INF/MANIFEST.MF         
  6.4 KiB │  +12 B │   6.2 KiB │    +12 B │ ∆ assets/dexopt/baseline.prof  
 62.7 KiB │  +11 B │ 140.9 KiB │      0 B │ ∆ META-INF/CERT.SF             
    749 B │   -5 B │     617 B │     -5 B │ ∆ assets/dexopt/baseline.profm 
  1.2 KiB │   +3 B │   1.2 KiB │      0 B │ ∆ META-INF/CERT.RSA            
  4.6 KiB │   -2 B │  22.3 KiB │      0 B │ ∆ AndroidManifest.xml          
──────────┼────────┼───────────┼──────────┼────────────────────────────────
  3.5 MiB │ +791 B │   7.7 MiB │ +2.6 KiB │ (total)
MANIFEST
@@ -337,2 +337,12 @@
         />
+    <service
+        android:enabled=false
+        android:exported=false
+        android:name=androidx.camera.core.impl.MetadataHolderService
+        >
+      <meta-data
+          android:name=androidx.camera.core.impl.MetadataHolderService.DEFAULT_CONFIG_PROVIDER
+          android:value=androidx.camera.camera2.Camera2Config_DefaultProvider
+          />
+    </service>
     <provider
@@ -355,12 +365,2 @@
     </provider>
-    <service
-        android:enabled=false
-        android:exported=false
-        android:name=androidx.camera.core.impl.MetadataHolderService
-        >
-      <meta-data
-          android:name=androidx.camera.core.impl.MetadataHolderService.DEFAULT_CONFIG_PROVIDER
-          android:value=androidx.camera.camera2.Camera2Config_DefaultProvider
-          />
-    </service>
     <uses-library
@@ -381,3 +381,21 @@
         />
+    <service
+        android:exported=false
+        android:name=com.google.android.datatransport.runtime.backends.TransportBackendDiscovery
+        >
+      <meta-data
+          android:name=backend:com.google.android.datatransport.cct.CctBackendFactory
+          android:value=cct
+          />
+    </service>
+    <service
+        android:exported=false
+        android:name=com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService
+        android:permission=android.permission.BIND_JOB_SERVICE
+        />
     <receiver
+        android:exported=false
+        android:name=com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver
+        />
+    <receiver
         android:directBootAware=false
@@ -409,20 +427,2 @@
     </receiver>
-    <service
-        android:exported=false
-        android:name=com.google.android.datatransport.runtime.backends.TransportBackendDiscovery
-        >
-      <meta-data
-          android:name=backend:com.google.android.datatransport.cct.CctBackendFactory
-          android:value=cct
-          />
-    </service>
-    <service
-        android:exported=false
-        android:name=com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService
-        android:permission=android.permission.BIND_JOB_SERVICE
-        />
-    <receiver
-        android:exported=false
-        android:name=com.google.android.datatransport.runtime.scheduling.jobscheduling.AlarmManagerSchedulerBroadcastReceiver
-        />
     <meta-data
DEX
STRINGS:

   old   │ new   │ diff         
  ───────┼───────┼──────────────
   36230 │ 36237 │ +7 (+26 -19) 
  + Crossfade
  + LFLFLLII
  + LLFLLLII
  + Lne/j0;
  + Lre/u;
  + Lsb/b;
  + [Landroidx/lifecycle/r;
  + [Landroidx/lifecycle/w;
  + [Lnb/c1;
  + [Lnb/f0;
  + [Lnb/i0;
  + [Lnb/q0;
  + [Lnb/q;
  + [Lne/x;
  + [Lre/p;
  + onAddPaymentMethodResult
  + onAddPaymentMethodResult_payments_core_release(Lcom/stripe/android/view/AddPaymentMethodActivityStarter_Result;)V
  + onChallengeResult = { ch…lengeResult(it)
          }
  + onFpxBankStatusesUpdated
  + onFpxBankStatusesUpdated(Lcom/stripe/android/model/BankStatuses;)V
  + onPaymentFlowResult
  + onPaymentFlowResult_payments_core_release(Lcom/stripe/android/payments/PaymentFlowResult_Unvalidated;)V
  + onResult(Landroidx/activity/result/ActivityResult;)V
  + public override fun onCr…        }
          }
      }
  + windowFromContext.decorView
  + ~~R8{backend:dex,compilation-mode:release,has-checksums:false,min-api:21,pg-map-id:d2f8e5c,r8-mode:full,version:8.0.40}
  
  - _onChallengeResult
  - LFLLII
  - Landroidx/lifecycle/z1;
  - Llc/t;
  - Lmc/c;
  - Lnb/h1;
  - [Landroidx/lifecycle/s;
  - [Landroidx/lifecycle/y;
  - [Lnb/d1;
  - [Lnb/h0;
  - [Lnb/l0;
  - [Lnb/s0;
  - [Lnb/w;
  - [Lne/w;
  - [Lre/l;
  - paymentFlowResult
  - registerForActivityResul…hWithResult(it)
          }
  - registerForActivityResul…lengeResult(it)
          }
  - ~~R8{backend:dex,compilation-mode:release,has-checksums:false,min-api:21,pg-map-id:c10dc28,r8-mode:full,version:8.0.40}
  

TYPES:

   old   │ new   │ diff         
  ───────┼───────┼──────────────
   12030 │ 12029 │ -1 (+12 -13) 
  + Lne/j0;
  + Lre/u;
  + Lsb/b;
  + [Landroidx/lifecycle/r;
  + [Landroidx/lifecycle/w;
  + [Lnb/c1;
  + [Lnb/f0;
  + [Lnb/i0;
  + [Lnb/q0;
  + [Lnb/q;
  + [Lne/x;
  + [Lre/p;
  
  - Landroidx/lifecycle/z1;
  - Llc/t;
  - Lmc/c;
  - Lnb/h1;
  - [Landroidx/lifecycle/s;
  - [Landroidx/lifecycle/y;
  - [Lnb/d1;
  - [Lnb/h0;
  - [Lnb/l0;
  - [Lnb/s0;
  - [Lnb/w;
  - [Lne/w;
  - [Lre/l;
  

METHODS:

   old   │ new   │ diff             
  ───────┼───────┼──────────────────
   53658 │ 53662 │ +4 (+1036 -1032) 
  + a0.a a(u1, Class, c) → r1
  + a0.f0 <init>(a0, String, l, String, c, int, int)
  + a0.f0 <init>(Object, l, a0, Object, f, int, int, int)
  + a0.f0 <init>(String, g0, a, Integer, Integer, int, int)
  + a0.f0 <init>(i, i, i, i, l, int, int)
  + a0.f0 <init>(e, int, String, String, a, c, int)
  + a0.g0 <init>(r0, c1, l, f, int, int)
  + a0.g0 <init>(Object, Object, Object, b, int, int, int)
  + a0.g0 A(Object, Object) → Object
  + a0.g0 a(i, int)
  + a0.h0 <clinit>()
  + a0.h0 <init>()
  + a0.i0 <init>(n1, int)
  + a0.i0 a(p0) → o0
  + a0.j0 <init>(s2, int)
  + a0.j0 E(Object) → Object
  + a0.j0 a(u)
  + a0.j0 b(c0)
  + a0.k0 <init>(int, int, Object, Object, Object, b)
  + a0.k0 <init>(n1, int, a0, Object, f)
  + a0.k0 <init>(c, Object, Object, Object, int)
  + a9.b <init>(b, h0, d, a, z, p2, String)
  + a9.b <init>(l, Context, h0, g0, Boolean, a, a)
  + aa.l i(Context, v, Bundle, x, m0, String, Bundle) → k
  + aa.l j(Context, v, Bundle, x, q) → k
  + aa.l m(Bundle, Bundle) → l1
  + aa.l n(Activity, w)
  + aa.l s() → v1
  + ae.h <init>(h0, x, i, d, i)
  + ae.n <init>(h0, x, i, d, q)
  + ae.o0 <init>(h0, x, i, d, PaymentSheetPrimaryButtonContainerFragment)
  + ae.p <init>(h0, x, i, d, q)
  + androidx.activity.ComponentActivity_3 c(h0, w)
  + androidx.activity.ComponentActivity_4 c(h0, w)
  + androidx.activity.ComponentActivity_5 c(h0, w)
  + androidx.activity.ImmLeaksCleaner c(h0, w)
  + androidx.activity.OnBackPressedDispatcher_LifecycleOnBackPressedCancellable <init>(v, y, q)
  + androidx.activity.OnBackPressedDispatcher_LifecycleOnBackPressedCancellable c(h0, w)
  + androidx.activity.n addMenuProvider(v, h0)
  + androidx.activity.n addMenuProvider(v, h0, x)
  + androidx.activity.n getDefaultViewModelProviderFactory() → u1
  + androidx.activity.n getLifecycle() → y
  + androidx.activity.n getViewModelStore() → x1
  + androidx.activity.o getLifecycle() → y
  + androidx.activity.result.ActivityResultRegistry_1 c(h0, w)
  + androidx.activity.result.h <init>(y)
  + androidx.activity.result.i c(String, h0, a, c) → f
  + androidx.activity.v a(h0, q)
  + androidx.appcompat.widget.w <init>(y1, h0, d, n, b0, p2)
  + androidx.appcompat.widget.w <init>(Object, f, n, l1, Application, int)
  + androidx.appcompat.widget.w <init>(b, f, n, l1, Application)
  + andr
...✂

@carlosmuvi-stripe carlosmuvi-stripe merged commit b96de32 into master May 5, 2023
@carlosmuvi-stripe carlosmuvi-stripe deleted the carlosmuvi/compose-1_4_3 branch May 5, 2023 00:14
ccen-stripe added a commit that referenced this pull request May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accept-risky-change accept-risky-change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants