Move amazon module into purchases by vegaro · Pull Request #1112 · RevenueCat/purchases-android

vegaro · 2023-06-29T14:26:32Z

Kept the :feature:amazon module with the dependency on the Amazon SDK, and the Android manifest permission, but moved its classes into the purchases module

vegaro · 2023-06-29T14:26:50Z

-// https://github.com/robolectric/robolectric-gradle-plugin/issues/144#issuecomment-265899560
-tasks.withType(Test) { jvmArgs += "-noverify" }
-
-task getAmazonLibrary {


This wasn't been used anymore

vegaro · 2023-06-29T14:27:06Z

-
-// Not running with this flag causes verification issues due to the way the Amazon jar is compiled
-// https://github.com/robolectric/robolectric-gradle-plugin/issues/144#issuecomment-265899560
-tasks.withType(Test) { jvmArgs += "-noverify" }


I removed this and saw no errors, so removed it

vegaro · 2023-06-29T14:27:38Z

-        <activity
-                android:name=".purchasing.ProxyAmazonBillingActivity"
-                android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar"/>


Also moved this Activity into the purchases module and kept it internal

vegaro · 2023-06-29T14:28:10Z

    testImplementation libs.bundles.test
    testImplementation libs.billing
    testImplementation libs.coroutines.test
+    testImplementation libs.amazon.appstore.sdk


testCompileOnly doesn't make the classes available at runtime.

vegaro · 2023-06-29T14:29:04Z

 import androidx.annotation.VisibleForTesting
 import com.revenuecat.purchases.amazon.PurchasingServiceProvider
-import com.revenuecat.purchases.amazon.R
+import com.revenuecat.purchases.api.R


moved the resources into the purchases module, so R will be under that namespace

codecov · 2023-06-30T06:52:11Z

Codecov Report

Merging #1112 (308bfcf) into main (5a5c66d) will decrease coverage by 0.01%.
The diff coverage is 85.71%.

@@            Coverage Diff             @@
##             main    #1112      +/-   ##
==========================================
- Coverage   85.12%   85.11%   -0.01%     
==========================================
  Files         183      183              
  Lines        6493     6490       -3     
  Branches      917      917              
==========================================
- Hits         5527     5524       -3     
  Misses        601      601              
  Partials      365      365

Impacted Files	Coverage Δ
...a/com/revenuecat/purchases/amazon/AmazonBackend.kt	`85.71% <ø> (ø)`
...a/com/revenuecat/purchases/amazon/AmazonBilling.kt	`63.25% <ø> (ø)`
...ava/com/revenuecat/purchases/amazon/AmazonCache.kt	`85.71% <ø> (ø)`
...evenuecat/purchases/amazon/AmazonOfferingParser.kt	`100.00% <ø> (ø)`
...evenuecat/purchases/amazon/AmazonPurchasingData.kt	`100.00% <ø> (ø)`
.../revenuecat/purchases/amazon/AmazonStoreProduct.kt	`92.85% <ø> (ø)`
...a/com/revenuecat/purchases/amazon/AmazonStrings.kt	`0.00% <ø> (ø)`
...rchases/amazon/DefaultPurchasingServiceProvider.kt	`14.28% <ø> (ø)`
...rchases/amazon/ISO3166Alpha2ToISO42170Converter.kt	`99.59% <ø> (ø)`
...azon/attribution/AmazonDeviceIdentifiersFetcher.kt	`100.00% <ø> (ø)`
... and 16 more

tonidero

Left a comment... I'm not sure if that's going to be a blocker for this project... Lmk what you think.

tonidero · 2023-06-30T07:00:42Z


 /** @suppress */
-typealias PostAmazonReceiptCallback = Pair<(response: JSONObject) -> Unit, (PurchasesError) -> Unit>
+internal typealias PostAmazonReceiptCallback = Pair<(response: JSONObject) -> Unit, (PurchasesError) -> Unit>


Do all these internal changes make this a breaking change? Since that we were overexposing things in the Amazon module 😬

oh, that's actually a good point, I didn't think people are directly depending on amazon. I will revert this visibility changes then

tonidero

Looks good!

@NachoSoto

**This is an automatic release.** ### New Features * `Trusted Entitlements`: made API stable (#1105) via NachoSoto (@NachoSoto) This new feature prevents MitM attacks between the SDK and the RevenueCat server. With verification enabled, the SDK ensures that the response created by the server was not modified by a third-party, and the entitlements received are exactly what was sent. This is 100% opt-in. `EntitlementInfos` have a new `VerificationResult` property, which will indicate the validity of the responses when this feature is enabled. ```kotlin fun configureRevenueCat() { val configuration = PurchasesConfiguration.Builder(context, apiKey) .entitlementVerificationMode(EntitlementVerificationMode.INFORMATIONAL) .build() Purchases.configure(configuration) } ``` ### Experimental features * Add await offerings (#1096) via Cesar de la Vega (@vegaro) ### Bugfixes * Fix issue updating customer info on app open (#1128) via Toni Rico (@tonidero) ### Dependency Updates * Bump fastlane-plugin-revenuecat_internal from `13773d2` to `b2108fb` (#1095) via dependabot[bot] (@dependabot[bot]) ### Other Changes * [PurchaseTester] Add option to purchase an arbitrary product id (#1099) via Mark Villacampa (@MarkVillacampa) * Fix release path after module refactor (#1129) via Toni Rico (@tonidero) * Fix load shedder integration tests (#1125) via Toni Rico (@tonidero) * Trusted entitlements: New trusted entitlements signature format (#1117) via Toni Rico (@tonidero) * Fix integration tests and change to a different project (#1123) via Toni Rico (@tonidero) * Move files into src/main/kotlin (#1122) via Cesar de la Vega (@vegaro) * Remove public module (#1113) via Cesar de la Vega (@vegaro) * Remove common module (#1106) via Cesar de la Vega (@vegaro) * Fix flaky integration tests: Wait for coroutines to finish before continuing (#1120) via Toni Rico (@tonidero) * Move amazon module into purchases (#1112) via Cesar de la Vega (@vegaro) * Trusted entitlements: Add IntermediateSignatureHelper to handle intermediate signature verification process (#1110) via Toni Rico (@tonidero) * Trusted entitlements: Add Signature type to process new signature response format (#1109) via Toni Rico (@tonidero) * [EXTERNAL] Add `awaitCustomerInfo` / coroutines tests to `TrustedEntitlementsInformationalModeIntegrationTest` (#1077) via @pablo-guardiola (#1107) via Toni Rico (@tonidero) * Remove feature:google module (#1104) via Cesar de la Vega (@vegaro) * Remove identity module (#1103) via Cesar de la Vega (@vegaro) * Remove subscriber attributes module (#1102) via Cesar de la Vega (@vegaro) * Delete utils module (#1098) via Cesar de la Vega (@vegaro) * Remove strings module (#1097) via Cesar de la Vega (@vegaro) * Update CHANGELOG.md to include external contribution (#1100) via Cesar de la Vega (@vegaro) * [EXTERNAL] Add missing `fetchPolicy` parameter to `awaitCustomerInfo` API (#1086) via @pablo-guardiola (#1090) via Toni Rico (@tonidero) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com>

vegaro added 2 commits June 29, 2023 16:19

moves amazon to purchases module

e9f7b55

removed explicit import

c1e150f

vegaro added the refactor label Jun 29, 2023

vegaro commented Jun 29, 2023

View reviewed changes

removes reflection

ee1575b

vegaro marked this pull request as ready for review June 29, 2023 18:04

vegaro requested a review from a team June 29, 2023 18:04

tonidero approved these changes Jun 30, 2023

View reviewed changes

revert internal changes

308bfcf

vegaro requested a review from tonidero June 30, 2023 07:26

tonidero approved these changes Jun 30, 2023

View reviewed changes

vegaro merged commit 6f336b1 into main Jun 30, 2023

vegaro deleted the cesar/sdk-3211-move-featureamazon-files-into-common-module branch June 30, 2023 07:38

RCGitBot mentioned this pull request Jul 10, 2023

[AUTOMATIC] Release/6.6.0 #1130

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move amazon module into purchases#1112

Move amazon module into purchases#1112
vegaro merged 4 commits into
mainfrom
cesar/sdk-3211-move-featureamazon-files-into-common-module

vegaro commented Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Uh oh!

codecov Bot commented Jun 30, 2023 •

edited

Loading

Uh oh!

tonidero left a comment

Uh oh!

tonidero Jun 30, 2023

Uh oh!

vegaro Jun 30, 2023

Uh oh!

tonidero left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

vegaro commented Jun 29, 2023

Uh oh!

vegaro Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

vegaro Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

vegaro Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

vegaro Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

vegaro Jun 29, 2023

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Jun 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

tonidero Jun 30, 2023

Choose a reason for hiding this comment

Uh oh!

vegaro Jun 30, 2023

Choose a reason for hiding this comment

Uh oh!

tonidero left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov Bot commented Jun 30, 2023 •

edited

Loading