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

Merge v3 into main #106

Merged
merged 23 commits into from
Jul 8, 2024
Merged

Merge v3 into main #106

merged 23 commits into from
Jul 8, 2024

Commits on Dec 20, 2023

  1. Configuration menu
    Copy the full SHA
    94bfffb View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Add Integration Pattern without Local Storage (#81)

    * Add methods without shared preferences
    * Update doc strings
    * Fix unit tests
    sarahkoop authored Jan 16, 2024
    Configuration menu
    Copy the full SHA
    b57e0ef View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Add Convenience String Methods to BrowserSwitchPendingRequest (#83)

    * Add convenence string methods
    sarahkoop authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    80d39e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Update Demo App for v3 Integration (#82)

    * Add compose integration
    * Update single top activity
    
    
    Co-authored-by: sshropshire <[email protected]>
    Co-authored-by: Tim Chow <[email protected]>
    3 people authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    98881c8 View commit details
    Browse the repository at this point in the history
  2. Remove v2 Integration Pattern Methods (#84)

    * Remove v2 methods
    * Remove BrowserSwitchPersistentStore
    * Remove persistent store
    sarahkoop authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    e9ab50a View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Upgrade Gradle Dependencies (#85)

    * Upgrade androix dependencies
    * Upgrade AGP to 8
    * Upgrade Kotlin version
    * Bump min sdk to 23
    * Bump CI to Java17
    sarahkoop authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    82eed68 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Fix Javadocs Task for SNAPSHOT Publish (#86)

    * Fix javadocs task
    sarahkoop authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    1408c08 View commit details
    Browse the repository at this point in the history
  2. v3 Migration Guide (#87)

    * Create migration guide
    * Add migration guide content
    * update min version info
    * Update README for v3
    
    ---------
    
    Co-authored-by: Tim Chow <[email protected]>
    Co-authored-by: Jax DesMarais-Leder <[email protected]>
    Co-authored-by: sshropshire <[email protected]>
    4 people authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    5d0c40c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Convert BrowserSwitchResult to Sealed Class (#88)

    * Rename BrowserSwitchResult
    * Add BrowserSwitchResult sealed class
    * Update result returned from parseResult
    * Update demo activity
    * Remove BrowserSwitchStatus
    * Update CHANGELOG, README, and MIGRATION_GUIDE
    * Update doc strings
    
    Co-authored-by: sshropshire <[email protected]>
    sarahkoop and sshropshire authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0ab5c35 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Update Gradle Release Tasks for Beta (#89)

    * Fix README task for beta versions
    
    * Fix SNAPSHOT task
    sarahkoop authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    52fcc27 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Update BrowserSwitchException and BrowserSwitchRequest Visibility Mod…

    …ifiers (#91)
    
    * Update BrowserSwitchException and BrowserSwitchRequest visibility modifiers
    
    * Fix fromJSON visible for testing modifier
    tdchow authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b3e52b4 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Visibility Changes for BT Venmo Module (#99)

    * Updated assertCanPerformBrowserSwitch to a public method, gradle updates for enabling local maven publishing, and updating version to 3.0.0-beta2-SNAPSHOT
    
    * Update changelog
    
    * Remove new line
    tdchow authored May 22, 2024
    Configuration menu
    Copy the full SHA
    a6acf21 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2c15543 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Rename parseResult to completeRequest (#101)

    * Rename parseResult to completeRequest
    
    * Update v3 migration guide
    tdchow authored May 29, 2024
    Configuration menu
    Copy the full SHA
    47e854d View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Merge main into v3

    tdchow committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4963edd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1231bf5 View commit details
    Browse the repository at this point in the history
  3. Remove DemoActivity

    tdchow committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    178143a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dd19dfa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    08c8cee View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge pull request #103 from braintree/main-into-v3

    Main into v3
    tdchow authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    ba3e2cc View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. V3 encode pending browser switch as base64 string (#104)

    * Remove BrowserSwitchRequest shouldNotifyCancelation property.
    
    * Rename BrowserSwitchResult to BrowserSwitchStartResult.
    
    * Add base 64 encode and decode methods.
    
    * Remove return result types.
    
    * Remove unecessary unit tests.
    
    * Fix broken unit test.
    
    * Fix broken unit tests.
    
    * Remove TODO to take it offline.
    
    * Cleanup BrowserSwitchClient docs.
    
    * Cleanup docs in BrowserSwitchCompleteRequestResult.
    
    * Fix BrowserSwitchOptions docs.
    
    * Remove legacy fromJson method.
    
    * Clean up docs.
    
    * Rename BrowserSwitchCompleteRequestResult to BrowserSwitchFinalResult.
    
    * Rename BrowserSwitchFinalResult.Success deepLinkUrl property to returnUrl.
    sshropshire authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    fa92641 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. [V3] Rename BrowserSwitchStartResult .Success to .Started (#105)

    * Rename BrowserSwitchStartResult.Success to BrowserSwitchStartResult.Started.
    
    * Annotate PendingRequestStore methods with @JvmStatic.
    sshropshire authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    b86cad7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'v3' into v3-into-main

    * v3: (21 commits)
      [V3] Rename BrowserSwitchStartResult `.Success` to `.Started` (#105)
      V3  encode pending browser switch as base64 string (#104)
      Fix changelog indents and fix app link unit test
      Pass app link in BrowserSwitchPendingRequestUnitTest
      Remove DemoActivity
      Fix Compose flow and move app link intent filter to DemoActivitySingleTop
      Merge main into v3
      Rename parseResult to completeRequest (#101)
      Revert version to beta1 (#100)
      Visibility Changes for BT Venmo Module (#99)
      Update BrowserSwitchException and BrowserSwitchRequest Visibility Modifiers (#91)
      Update Gradle Release Tasks for Beta (#89)
      Convert `BrowserSwitchResult` to Sealed Class (#88)
      v3 Migration Guide (#87)
      Fix Javadocs Task for SNAPSHOT Publish (#86)
      Upgrade Gradle Dependencies (#85)
      Remove v2 Integration Pattern Methods (#84)
      Update Demo App for v3 Integration (#82)
      Add Convenience String Methods to BrowserSwitchPendingRequest (#83)
      Add Integration Pattern without Local Storage (#81)
      ...
    
    # Conflicts:
    #	CHANGELOG.md
    #	README.md
    #	browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchClient.java
    #	browser-switch/src/main/java/com/braintreepayments/api/BrowserSwitchRequest.java
    #	browser-switch/src/test/java/com/braintreepayments/api/BrowserSwitchClientUnitTest.java
    #	browser-switch/src/test/java/com/braintreepayments/api/BrowserSwitchRequestUnitTest.java
    #	browser-switch/src/test/java/com/braintreepayments/api/BrowserSwitchResultUnitTest.java
    #	build.gradle
    #	demo/src/main/AndroidManifest.xml
    #	demo/src/main/java/com/braintreepayments/api/browserswitch/demo/DemoActivity.java
    #	demo/src/main/java/com/braintreepayments/api/browserswitch/demo/DemoActivitySingleTop.java
    #	demo/src/main/java/com/braintreepayments/api/browserswitch/demo/DemoFragment.java
    #	demo/src/main/res/values/strings.xml
    #	gradle/gradle-publish.gradle
    tdchow committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    15358b5 View commit details
    Browse the repository at this point in the history