[BC5] AmazonStoreProduct updates#881
Merged
Merged
Conversation
added 30 commits
February 17, 2023 10:11
…ng for amazon vs play
# Conflicts: # common/src/test/java/com/revenuecat/purchases/common/OfferingsTest.kt # purchases/src/main/kotlin/com/revenuecat/purchases/Purchases.kt
# Conflicts: # common/src/main/java/com/revenuecat/purchases/common/OfferingFactories.kt # feature/amazon/src/main/java/com/revenuecat/purchases/amazon/storeProductConversions.kt
# Conflicts: # feature/amazon/src/main/java/com/revenuecat/purchases/amazon/storeProductConversions.kt
added 4 commits
March 17, 2023 10:06
# Conflicts: # feature/amazon/src/main/java/com/revenuecat/purchases/amazon/storeProductConversions.kt
Codecov Report
@@ Coverage Diff @@
## bc5-support #881 +/- ##
===============================================
+ Coverage 84.04% 84.09% +0.04%
===============================================
Files 153 155 +2
Lines 5366 5382 +16
Branches 758 763 +5
===============================================
+ Hits 4510 4526 +16
+ Misses 566 565 -1
- Partials 290 291 +1
... and 2 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
… over tests from google version
) ### Motivation [CF-1288](https://revenuecats.atlassian.net/browse/CF-1288) ### Description Parses Amazon's English language period durations into a `Period` object and an ISO 8601 string 💪 [CF-1288]: https://revenuecats.atlassian.net/browse/CF-1288?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
vegaro
approved these changes
Mar 20, 2023
| dataStoreUtils.getSdkConfig().onEach { sdkConfiguration -> | ||
| isPlayStore = !sdkConfiguration.useAmazon | ||
| }.collect() | ||
| } |
swehner
reviewed
Mar 21, 2023
| android:text="@string/subscription_options" | ||
| android:textStyle="bold" | ||
| android:visibility="@{isSubscription ? View.VISIBLE : View.GONE}" | ||
| android:visibility="@{isSubscription & isPlayStore ? View.VISIBLE : View.GONE}" |
Contributor
There was a problem hiding this comment.
SHouldn't this be using && instead of & "@{isSubscription && isPlayStore ? View.VISIBLE : View.GONE}
Member
There was a problem hiding this comment.
Ah, I think it should actually be && 🤔 We can't put && directly in because its XML and it yells at us but it should be two & instead of one
Contributor
There was a problem hiding this comment.
yup, would have been the binary operator otherwise. thanks for fixing it. i thought xml would at least allow literal & in attributes, but doesn't look like it either
Comment on lines
243
to
+245
| sh("git reset --hard") | ||
| sh("git clean -fd") | ||
| sh("cd .. && git clean -fd") | ||
| end |
Contributor
There was a problem hiding this comment.
So this resets the repo at the current dir and cleans the one in the parent? Is this correct?
Also maybe you can use git -C .. clean -fg instead of doing cd
Member
There was a problem hiding this comment.
This looks like it should also work 😁 I can change it to that!
joshdholtz
reviewed
Mar 21, 2023
Member
There was a problem hiding this comment.
Yesss, this needed to be its own file 💪
Merged
joshdholtz
added a commit
that referenced
this pull request
Mar 23, 2023
### Breaking Changes * Rename `introTrial` to `introOffer` on `SubscriptionOptions` (#890) via Josh Holtz (@joshdholtz) * Use `rc-ignore-offer` instead of `rc-ignore-befault-offer` (#889) via Josh Holtz (@joshdholtz) * AmazonStoreProduct updates (#881) via beylmk (@beylmk) * Remove Parcelable implementation for classes with ProductDetails as a member (#866) via beylmk (@beylmk) * Make Activity first param in PurchaseParams (#882) via Josh Holtz (@joshdholtz) ### New Features * Re-enable `observerMode` and `syncPurchases()` (#878) via Josh Holtz (@joshdholtz) ### Bugfixes * Re-add `price_string` header on postReceipt (#879) via Josh Holtz (@joshdholtz) ### Other Changes * Cleaning up some TODOs in the code (#883) via Josh Holtz (@joshdholtz) * Amazon Offering Parsing (#824) via beylmk (@beylmk) * Merge main -> bc5-support 2023-03-15 (#875) via Toni Rico (@tonidero) * Fix purchase tester navigation (#871) via beylmk (@beylmk)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motiviation
https://revenuecats.atlassian.net/browse/CF-1197 - AmazonStoreProduct updates
https://revenuecats.atlassian.net/browse/CF-1199 - Update purchase tester for amazon
https://revenuecats.atlassian.net/browse/CF-1217 - Remove isProductChange for amazon
https://revenuecats.atlassian.net/browse/CF-1288 - Add Period to AmazonStoreProduct for subscription and free trial
Description
AmazonStoreProductandAmazonPurchasingDatahave their own files nowskuonAmazonStoreProductLockedFeature.AmazonStoreAmazonStoreProductto API Tester:feature:amazonmodule was addedbuild_purchase_testerlane in theFastfilefor building an APK for Amazonbuild_magic_weatherTODO: