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

Main into v3 #103

Merged
merged 5 commits into from
Jun 4, 2024
Merged

Main into v3 #103

merged 5 commits into from
Jun 4, 2024

Conversation

tdchow
Copy link
Contributor

@tdchow tdchow commented Jun 3, 2024

Summary of changes

  • Merge main into v3

Checklist

  • Added a changelog entry

Authors

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

@tdchow tdchow requested a review from a team as a code owner June 3, 2024 19:43
//import com.braintreepayments.api.BrowserSwitchOptions;
//import com.braintreepayments.api.BrowserSwitchResult;
//
//public class DemoActivity extends AppCompatActivity {
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep 😅 just removed it.

CHANGELOG.md Outdated
Comment on lines 7 to 17
* Bump `minSdkVersion` to API 23
* Bump target Java version to Java 11
* Upgrade Kotlin version to 1.9.10
* Upgrade to Android Gradle Plugin 8
* Change `BrowserSwitchClient#start` parameters and return type
* Change `BrowserSwitchClient#parseResult` parameters
* Remove `deliverResult`, `getResult`, `captureResult`, `clearActiveRequests`, `getResultFromCache`, and `deliverResultFromCache` from `BrowserSwitchClient`
* Add `BrowserSwitchRequest` and `BrowserSwitchPendingRequest`
* Convert `BrowserSwitchResult` to sealed class and add `BrowserSwitchResultInfo`
* Remove `BrowserSwitchStatus`
* Rename `parseResult()` to `completeRequest()`
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like these are bumped in a little too far now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

}


// TODO: FIX THIS
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume this should still be commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i ended up fixing the test case 👍

Copy link
Contributor

@sarahkoop sarahkoop left a comment

Choose a reason for hiding this comment

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

One commented out test Jax already noted, otherwise LGTM

@tdchow tdchow merged commit ba3e2cc into v3 Jun 4, 2024
3 checks passed
@tdchow tdchow deleted the main-into-v3 branch June 4, 2024 14:55
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.

5 participants