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

[Connect] Remove duplicate annotation #9886

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

simond-stripe
Copy link
Contributor

Summary

When merging #9780 and #9879 the merge unintentionally added the same annotation to StripeConnectWebViewContainerController twice (once for each PR), which fails the build on master. This PR removes the duplicate annotation and unblocks the build

Motivation

Unblock master and fix the build

Testing

I ran ./gradlew :connect:compileReleaseKotlin and confirmed it compiles

  • Added tests
  • Modified tests
  • Manually verified

@simond-stripe simond-stripe requested a review from a team as a code owner January 10, 2025 15:24
@simond-stripe simond-stripe enabled auto-merge (squash) January 10, 2025 15:26
Copy link
Contributor

Diffuse output:

OLD: identity-example-release-base.apk (signature: V1, V2)
NEW: identity-example-release-pr.apk (signature: V1, V2)

          │          compressed          │         uncompressed         
          ├───────────┬───────────┬──────┼───────────┬───────────┬──────
 APK      │ old       │ new       │ diff │ old       │ new       │ diff 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
      dex │     2 MiB │     2 MiB │  0 B │   4.1 MiB │   4.1 MiB │  0 B 
     arsc │     1 MiB │     1 MiB │  0 B │     1 MiB │     1 MiB │  0 B 
 manifest │   2.3 KiB │   2.3 KiB │  0 B │     8 KiB │     8 KiB │  0 B 
      res │ 301.8 KiB │ 301.8 KiB │  0 B │ 455.5 KiB │ 455.5 KiB │  0 B 
   native │   6.2 MiB │   6.2 MiB │  0 B │  15.8 MiB │  15.8 MiB │  0 B 
    asset │   7.1 KiB │   7.1 KiB │  0 B │   6.9 KiB │   6.9 KiB │  0 B 
    other │  90.3 KiB │  90.2 KiB │ -7 B │ 170.3 KiB │ 170.3 KiB │  0 B 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
    total │   9.6 MiB │   9.6 MiB │ -7 B │  21.5 MiB │  21.5 MiB │  0 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 19971 │ 19971 │ 0 (+0 -0) 
   types │  6191 │  6191 │ 0 (+0 -0) 
 classes │  4982 │  4982 │ 0 (+0 -0) 
 methods │ 29772 │ 29772 │ 0 (+0 -0) 
  fields │ 17542 │ 17542 │ 0 (+0 -0) 

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  164 │  164 │  0   
 entries │ 3622 │ 3622 │  0
APK
   compressed    │  uncompressed   │                        
──────────┬──────┼──────────┬──────┤                        
 size     │ diff │ size     │ diff │ path                   
──────────┼──────┼──────────┼──────┼────────────────────────
 28.5 KiB │ -9 B │ 62.9 KiB │  0 B │ ∆ META-INF/CERT.SF     
 25.3 KiB │ +3 B │ 62.8 KiB │  0 B │ ∆ META-INF/MANIFEST.MF 
  1.2 KiB │ -1 B │  1.2 KiB │  0 B │ ∆ META-INF/CERT.RSA    
──────────┼──────┼──────────┼──────┼────────────────────────
 54.9 KiB │ -7 B │  127 KiB │  0 B │ (total)

@simond-stripe simond-stripe merged commit 580f744 into master Jan 10, 2025
13 checks passed
@simond-stripe simond-stripe deleted the simond/fix-annotation-error branch January 10, 2025 15:46
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.

3 participants