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

Conversation

tdchow
Copy link
Contributor

@tdchow tdchow commented Jul 8, 2024

Summary of changes

  • merge v3 into main

Checklist

  • Added a changelog entry

Authors

List GitHub usernames for everyone who contributed to this pull request.

sarahkoop and others added 23 commits December 20, 2023 09:08
* Add methods without shared preferences
* Update doc strings
* Fix unit tests
* Add compose integration
* Update single top activity


Co-authored-by: sshropshire <[email protected]>
Co-authored-by: Tim Chow <[email protected]>
* Remove v2 methods
* Remove BrowserSwitchPersistentStore
* Remove persistent store
* Upgrade androix dependencies
* Upgrade AGP to 8
* Upgrade Kotlin version
* Bump min sdk to 23
* Bump CI to Java17
* 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]>
* 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]>
* Fix README task for beta versions

* Fix SNAPSHOT task
…ifiers (#91)

* Update BrowserSwitchException and BrowserSwitchRequest visibility modifiers

* Fix fromJSON visible for testing modifier
* 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
* Rename parseResult to completeRequest

* Update v3 migration guide
* 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.
* Rename BrowserSwitchStartResult.Success to BrowserSwitchStartResult.Started.

* Annotate PendingRequestStore methods with @JvmStatic.
* 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 tdchow requested a review from a team as a code owner July 8, 2024 20:08
Copy link
Contributor

@jaxdesmarais jaxdesmarais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@tdchow tdchow merged commit 7430fd5 into main Jul 8, 2024
3 checks passed
@tdchow tdchow deleted the v3-into-main branch July 8, 2024 20:42
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.

4 participants