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

Revert "Use Compose BOM for Compose related dependencies" #6697

Merged
merged 3 commits into from
May 9, 2023

Conversation

ccen-stripe
Copy link
Collaborator

@ccen-stripe ccen-stripe commented May 9, 2023

Summary

Motivation

The bom change breaks React Native SDK, filed a issue here

Testing

  • Added tests
  • Modified tests
  • Manually verified

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 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.

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 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 │ -738 B │   7.4 MiB │   7.4 MiB │ -2.5 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 │   +1 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 │  -12 B │     3 MiB │     3 MiB │    -12 B 
    other │ 199.7 KiB │ 199.7 KiB │   +3 B │ 446.8 KiB │ 446.8 KiB │      0 B 
──────────┼───────────┼───────────┼────────┼───────────┼───────────┼──────────
    total │  12.1 MiB │  12.1 MiB │ -746 B │  20.3 MiB │  20.3 MiB │ -2.5 KiB 

 DEX     │ old   │ new   │ diff           
─────────┼───────┼───────┼────────────────
   files │     1 │     1 │  0             
 strings │ 36245 │ 36239 │ -6 (+19 -25)   
   types │ 12045 │ 12046 │ +1 (+13 -12)   
 classes │ 10145 │ 10146 │ +1 (+4 -3)     
 methods │ 53662 │ 53658 │ -4 (+985 -989) 
  fields │ 34111 │ 34114 │ +3 (+616 -613) 

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  291 │  291 │  0   
 entries │ 6942 │ 6942 │  0
APK
    compressed     │     uncompressed     │                                
──────────┬────────┼───────────┬──────────┤                                
 size     │ diff   │ size      │ diff     │ path                           
──────────┼────────┼───────────┼──────────┼────────────────────────────────
  3.4 MiB │ -738 B │   7.4 MiB │ -2.5 KiB │ ∆ classes.dex                  
  6.3 KiB │  -20 B │   6.2 KiB │    -20 B │ ∆ assets/dexopt/baseline.prof  
 62.7 KiB │   +9 B │ 140.9 KiB │      0 B │ ∆ META-INF/CERT.SF             
    751 B │   +8 B │     619 B │     +8 B │ ∆ assets/dexopt/baseline.profm 
 48.5 KiB │   -8 B │ 140.8 KiB │      0 B │ ∆ META-INF/MANIFEST.MF         
  1.2 KiB │   +2 B │   1.2 KiB │      0 B │ ∆ META-INF/CERT.RSA            
  4.6 KiB │   +1 B │  22.3 KiB │      0 B │ ∆ AndroidManifest.xml          
──────────┼────────┼───────────┼──────────┼────────────────────────────────
  3.5 MiB │ -746 B │   7.7 MiB │ -2.5 KiB │ (total)
MANIFEST
@@ -337,12 +337,2 @@
         />
-    <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
@@ -365,2 +355,12 @@
     </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,21 +381,3 @@
         />
-    <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
@@ -427,2 +409,20 @@
     </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         
  ───────┼───────┼──────────────
   36245 │ 36239 │ -6 (+19 -25) 
  + _onChallengeResult
  + LFLLII
  + Landroidx/lifecycle/z1;
  + Llc/t;
  + Lmc/c;
  + Lnb/g1;
  + [Landroidx/lifecycle/s;
  + [Landroidx/lifecycle/y;
  + [Lnb/c1;
  + [Lnb/g0;
  + [Lnb/k0;
  + [Lnb/r0;
  + [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:f93b605,r8-mode:full,version:8.0.40}
  
  - Crossfade
  - LFLFLLII
  - LLFLLLII
  - Lne/j0;
  - Lre/u;
  - Lsb/b;
  - [Landroidx/lifecycle/r;
  - [Landroidx/lifecycle/w;
  - [Lnb/b1;
  - [Lnb/e0;
  - [Lnb/h0;
  - [Lnb/p0;
  - [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…        }
          }
      }
  - ~~R8{backend:dex,compilation-mode:release,has-checksums:false,min-api:21,pg-map-id:8c93bb3,r8-mode:full,version:8.0.40}
  

TYPES:

   old   │ new   │ diff         
  ───────┼───────┼──────────────
   12045 │ 12046 │ +1 (+13 -12) 
  + Landroidx/lifecycle/z1;
  + Llc/t;
  + Lmc/c;
  + Lnb/g1;
  + [Landroidx/lifecycle/s;
  + [Landroidx/lifecycle/y;
  + [Lnb/c1;
  + [Lnb/g0;
  + [Lnb/k0;
  + [Lnb/r0;
  + [Lnb/w;
  + [Lne/w;
  + [Lre/l;
  
  - Lne/j0;
  - Lre/u;
  - Lsb/b;
  - [Landroidx/lifecycle/r;
  - [Landroidx/lifecycle/w;
  - [Lnb/b1;
  - [Lnb/e0;
  - [Lnb/h0;
  - [Lnb/p0;
  - [Lnb/q;
  - [Lne/x;
  - [Lre/p;
  

METHODS:

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

@ccen-stripe ccen-stripe force-pushed the revert-6676-carlosmuvi/compose-1_4_3 branch from 101a570 to 98dd1bb Compare May 9, 2023 20:46
@ccen-stripe ccen-stripe marked this pull request as ready for review May 9, 2023 20:48
@ccen-stripe ccen-stripe requested review from a team as code owners May 9, 2023 20:48
@ccen-stripe ccen-stripe requested review from carlosmuvi-stripe and removed request for awush-stripe May 9, 2023 20:49
@ccen-stripe
Copy link
Collaborator Author

cc @charliecruzan-stripe

@ccen-stripe ccen-stripe added the accept-risky-change accept-risky-change label May 9, 2023
@ccen-stripe ccen-stripe merged commit 14daa70 into master May 9, 2023
16 of 17 checks passed
@ccen-stripe ccen-stripe deleted the revert-6676-carlosmuvi/compose-1_4_3 branch May 9, 2023 21:08
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.

None yet

2 participants