Move amazon module into purchases (#1112)

RevenueCat · Jun 30, 2023 · 6f336b1 · 6f336b1
1 parent e6e498c
commit 6f336b1
Show file tree

Hide file tree

Showing 55 changed files with 23 additions and 95 deletions.
diff --git a/api-tester/src/main/java/com/revenuecat/apitester/java/StoreProductAPI.java b/api-tester/src/main/java/com/revenuecat/apitester/java/StoreProductAPI.java
@@ -4,7 +4,6 @@
 import com.revenuecat.purchases.ProductType;
 import com.revenuecat.purchases.amazon.AmazonStoreProduct;
 import com.revenuecat.purchases.amazon.AmazonStoreProductKt;
-import com.revenuecat.purchases.models.GoogleSubscriptionOption;
 import com.revenuecat.purchases.models.GoogleStoreProduct;
 import com.revenuecat.purchases.models.GoogleStoreProductKt;
 import com.revenuecat.purchases.models.Price;

diff --git a/feature/amazon/build.gradle b/feature/amazon/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     alias libs.plugins.android.library
     alias libs.plugins.kotlin.android
-    alias libs.plugins.kotlin.parcelize
     alias libs.plugins.mavenPublish
 }
 
@@ -11,67 +10,9 @@ android {
     namespace 'com.revenuecat.purchases.amazon'
 }
 
-ext {
-    amazon2Version = "2.0.76"
-    amazon2FileName = "in-app-purchasing-${amazon2Version}.jar"
-}
-
 dependencies {
     implementation project(":purchases")
     implementation project(":common")
 
-    implementation libs.kotlin.stdlib
-    implementation libs.androidx.annotation
     implementation libs.amazon.appstore.sdk
-
-    testImplementation project(":test-utils")
-    testImplementation libs.amazon.appstore.sdk
-    testImplementation libs.bundles.test
-}
-
-// 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" }
-
-task getAmazonLibrary {
-    ext {
-        downloadURL = "https://amzndevresources.com/iap/sdk/AmazonInAppPurchasing_Android.zip"
-        destFile = new File(projectDir, "libs/$amazon2FileName")
-    }
-
-    inputs.property('downloadURL', downloadURL)
-    inputs.property('fileToExtract', amazon2FileName)
-    outputs.file(destFile)
-
-    doLast {
-        if (!destFile.exists()) {
-            println 'Downloading Amazon dependency'
-            File destDir = destFile.parentFile
-            destDir.mkdirs()
-
-            File downloadFile = new File(temporaryDir, 'download.zip')
-            new URL(downloadURL).withInputStream { is ->
-                downloadFile.withOutputStream { it << is }
-            }
-
-            project.copy {
-                from {
-                    zipTree(downloadFile).matching { include "**/$amazon2FileName" }.singleFile
-                }
-
-                into(destDir)
-            }
-        }
-    }
-}
-
-task cleanAmazonLibrary(type: Delete) {
-    delete new File(projectDir, "libs/$amazon2FileName")
-}
-
-afterEvaluate {
-    preDefaultsDebugBuild.dependsOn cleanAmazonLibrary
-    preDefaultsReleaseBuild.dependsOn cleanAmazonLibrary
-    preIntegrationTestDebugBuild.dependsOn cleanAmazonLibrary
-    preIntegrationTestReleaseBuild.dependsOn cleanAmazonLibrary
 }
diff --git a/feature/amazon/src/main/AndroidManifest.xml b/feature/amazon/src/main/AndroidManifest.xml
@@ -10,10 +10,6 @@
                 <action android:name="com.amazon.inapp.purchasing.NOTIFY" />
             </intent-filter>
         </receiver>
-        <activity
-                android:name=".purchasing.ProxyAmazonBillingActivity"
-                android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
     </application>
 
 </manifest>
diff --git a/purchases/build.gradle b/purchases/build.gradle
@@ -3,6 +3,7 @@ plugins {
     alias libs.plugins.kotlin.android
     alias libs.plugins.mavenPublish
     alias libs.plugins.dokka
+    alias libs.plugins.kotlin.parcelize
 }
 
 apply from: "$rootProject.projectDir/library.gradle"
@@ -54,10 +55,13 @@ dependencies {
     implementation libs.androidx.lifecycle.common
     implementation libs.androidx.lifecycle.process
 
+    compileOnly libs.amazon.appstore.sdk
+
     testImplementation project(":test-utils")
     testImplementation libs.bundles.test
     testImplementation libs.billing
     testImplementation libs.coroutines.test
+    testImplementation libs.amazon.appstore.sdk
 
     integrationTestImplementation libs.androidx.appcompat
     integrationTestImplementation libs.material

diff --git a/purchases/src/main/AndroidManifest.xml b/purchases/src/main/AndroidManifest.xml
@@ -1,4 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application>
+        <activity
+                android:name="com.revenuecat.purchases.amazon.purchasing.ProxyAmazonBillingActivity"
+                android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+    </application>
+
 </manifest>
 
diff --git a/...enuecat/purchases/amazon/AmazonBackend.kt → ...enuecat/purchases/amazon/AmazonBackend.kt b/...enuecat/purchases/amazon/AmazonBackend.kt → ...enuecat/purchases/amazon/AmazonBackend.kt
diff --git a/...enuecat/purchases/amazon/AmazonBilling.kt → ...enuecat/purchases/amazon/AmazonBilling.kt b/...enuecat/purchases/amazon/AmazonBilling.kt → ...enuecat/purchases/amazon/AmazonBilling.kt
diff --git a/...evenuecat/purchases/amazon/AmazonCache.kt → ...evenuecat/purchases/amazon/AmazonCache.kt b/...evenuecat/purchases/amazon/AmazonCache.kt → ...evenuecat/purchases/amazon/AmazonCache.kt
diff --git a/.../purchases/amazon/AmazonOfferingParser.kt → .../purchases/amazon/AmazonOfferingParser.kt b/.../purchases/amazon/AmazonOfferingParser.kt → .../purchases/amazon/AmazonOfferingParser.kt
diff --git a/.../purchases/amazon/AmazonPurchasingData.kt → .../purchases/amazon/AmazonPurchasingData.kt b/.../purchases/amazon/AmazonPurchasingData.kt → .../purchases/amazon/AmazonPurchasingData.kt
diff --git a/...at/purchases/amazon/AmazonStoreProduct.kt → ...at/purchases/amazon/AmazonStoreProduct.kt b/...at/purchases/amazon/AmazonStoreProduct.kt → ...at/purchases/amazon/AmazonStoreProduct.kt
diff --git a/...enuecat/purchases/amazon/AmazonStrings.kt → ...enuecat/purchases/amazon/AmazonStrings.kt b/...enuecat/purchases/amazon/AmazonStrings.kt → ...enuecat/purchases/amazon/AmazonStrings.kt
diff --git a/...mazon/DefaultPurchasingServiceProvider.kt → ...mazon/DefaultPurchasingServiceProvider.kt b/...mazon/DefaultPurchasingServiceProvider.kt → ...mazon/DefaultPurchasingServiceProvider.kt
diff --git a/...mazon/ISO3166Alpha2ToISO42170Converter.kt → ...mazon/ISO3166Alpha2ToISO42170Converter.kt b/...mazon/ISO3166Alpha2ToISO42170Converter.kt → ...mazon/ISO3166Alpha2ToISO42170Converter.kt
diff --git a/...hases/amazon/PurchasingServiceProvider.kt → ...hases/amazon/PurchasingServiceProvider.kt b/...hases/amazon/PurchasingServiceProvider.kt → ...hases/amazon/PurchasingServiceProvider.kt
diff --git a/...ibution/AmazonDeviceIdentifiersFetcher.kt → ...ibution/AmazonDeviceIdentifiersFetcher.kt b/...ibution/AmazonDeviceIdentifiersFetcher.kt → ...ibution/AmazonDeviceIdentifiersFetcher.kt
diff --git a/...com/revenuecat/purchases/amazon/errors.kt → ...com/revenuecat/purchases/amazon/errors.kt b/...com/revenuecat/purchases/amazon/errors.kt → ...com/revenuecat/purchases/amazon/errors.kt
diff --git a/...ases/amazon/handler/ProductDataHandler.kt → ...ases/amazon/handler/ProductDataHandler.kt b/...ases/amazon/handler/ProductDataHandler.kt → ...ases/amazon/handler/ProductDataHandler.kt
diff --git a/...rchases/amazon/handler/PurchaseHandler.kt → ...rchases/amazon/handler/PurchaseHandler.kt b/...rchases/amazon/handler/PurchaseHandler.kt → ...rchases/amazon/handler/PurchaseHandler.kt
diff --git a/.../amazon/handler/PurchaseUpdatesHandler.kt → .../amazon/handler/PurchaseUpdatesHandler.kt b/.../amazon/handler/PurchaseUpdatesHandler.kt → .../amazon/handler/PurchaseUpdatesHandler.kt
diff --git a/...rchases/amazon/handler/UserDataHandler.kt → ...rchases/amazon/handler/UserDataHandler.kt b/...rchases/amazon/handler/UserDataHandler.kt → ...rchases/amazon/handler/UserDataHandler.kt
diff --git a/...n/listener/ProductDataResponseListener.kt → ...n/listener/ProductDataResponseListener.kt b/...n/listener/ProductDataResponseListener.kt → ...n/listener/ProductDataResponseListener.kt
diff --git a/...azon/listener/PurchaseResponseListener.kt → ...azon/listener/PurchaseResponseListener.kt b/...azon/listener/PurchaseResponseListener.kt → ...azon/listener/PurchaseResponseListener.kt
diff --git a/...stener/PurchaseUpdatesResponseListener.kt → ...stener/PurchaseUpdatesResponseListener.kt b/...stener/PurchaseUpdatesResponseListener.kt → ...stener/PurchaseUpdatesResponseListener.kt
diff --git a/...azon/listener/UserDataResponseListener.kt → ...azon/listener/UserDataResponseListener.kt b/...azon/listener/UserDataResponseListener.kt → ...azon/listener/UserDataResponseListener.kt
diff --git a/...urchases/amazon/productTypeConversions.kt → ...urchases/amazon/productTypeConversions.kt b/...urchases/amazon/productTypeConversions.kt → ...urchases/amazon/productTypeConversions.kt
diff --git a/.../purchasing/ProxyAmazonBillingActivity.kt → .../purchasing/ProxyAmazonBillingActivity.kt b/.../purchasing/ProxyAmazonBillingActivity.kt → .../purchasing/ProxyAmazonBillingActivity.kt
@@ -7,7 +7,7 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import androidx.annotation.VisibleForTesting
 import com.revenuecat.purchases.amazon.PurchasingServiceProvider
-import com.revenuecat.purchases.amazon.R
+import com.revenuecat.purchases.api.R
 
 internal class ProxyAmazonBillingActivity : Activity() {
 

diff --git a/...AmazonBillingActivityBroadcastReceiver.kt → ...AmazonBillingActivityBroadcastReceiver.kt b/...AmazonBillingActivityBroadcastReceiver.kt → ...AmazonBillingActivityBroadcastReceiver.kt
diff --git a/.../purchasing/ProxyAmazonBillingDelegate.kt → .../purchasing/ProxyAmazonBillingDelegate.kt b/.../purchasing/ProxyAmazonBillingDelegate.kt → .../purchasing/ProxyAmazonBillingDelegate.kt
diff --git a/...rchases/amazon/storeProductConversions.kt → ...rchases/amazon/storeProductConversions.kt b/...rchases/amazon/storeProductConversions.kt → ...rchases/amazon/storeProductConversions.kt
diff --git a/...ses/amazon/storeTransactionConversions.kt → ...ses/amazon/storeTransactionConversions.kt b/...ses/amazon/storeTransactionConversions.kt → ...ses/amazon/storeTransactionConversions.kt
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/BillingFactory.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/BillingFactory.kt
@@ -1,11 +1,10 @@
 package com.revenuecat.purchases
 
 import android.app.Application
-import android.content.Context
 import android.os.Handler
 import androidx.annotation.VisibleForTesting
+import com.revenuecat.purchases.amazon.AmazonBilling
 import com.revenuecat.purchases.common.BackendHelper
-import com.revenuecat.purchases.common.BillingAbstract
 import com.revenuecat.purchases.common.caching.DeviceCache
 import com.revenuecat.purchases.common.diagnostics.DiagnosticsTracker
 import com.revenuecat.purchases.common.errorLog
@@ -31,21 +30,14 @@ object BillingFactory {
         )
         Store.AMAZON -> {
             try {
-                Class.forName("com.revenuecat.purchases.amazon.AmazonBilling")
-                    .getConstructor(
-                        Context::class.java,
-                        DeviceCache::class.java,
-                        Boolean::class.java,
-                        Handler::class.java,
-                        BackendHelper::class.java,
-                    ).newInstance(
-                        application.applicationContext,
-                        cache,
-                        observerMode,
-                        Handler(application.mainLooper),
-                        backendHelper,
-                    ) as BillingAbstract
-            } catch (e: ClassNotFoundException) {
+                AmazonBilling(
+                    application.applicationContext,
+                    cache,
+                    observerMode,
+                    Handler(application.mainLooper),
+                    backendHelper,
+                )
+            } catch (e: NoClassDefFoundError) {
                 errorLog("Make sure purchases-amazon is added as dependency", e)
                 throw e
             }

diff --git a/...amazon/src/main/res/values-v21/styles.xml → purchases/src/main/res/values-v21/styles.xml b/...amazon/src/main/res/values-v21/styles.xml → purchases/src/main/res/values-v21/styles.xml
diff --git a/...ure/amazon/src/main/res/values/styles.xml → purchases/src/main/res/values/styles.xml b/...ure/amazon/src/main/res/values/styles.xml → purchases/src/main/res/values/styles.xml
diff --git a/...cat/purchases/amazon/AmazonBackendTest.kt → ...cat/purchases/amazon/AmazonBackendTest.kt b/...cat/purchases/amazon/AmazonBackendTest.kt → ...cat/purchases/amazon/AmazonBackendTest.kt
diff --git a/...cat/purchases/amazon/AmazonBillingTest.kt → ...cat/purchases/amazon/AmazonBillingTest.kt b/...cat/purchases/amazon/AmazonBillingTest.kt → ...cat/purchases/amazon/AmazonBillingTest.kt
@@ -17,7 +17,6 @@ import com.revenuecat.purchases.amazon.helpers.dummyAmazonProduct
 import com.revenuecat.purchases.amazon.helpers.dummyReceipt
 import com.revenuecat.purchases.amazon.helpers.dummyUserData
 import com.revenuecat.purchases.amazon.helpers.successfulRVSResponse
-import com.revenuecat.purchases.common.BillingAbstract
 import com.revenuecat.purchases.common.sha1
 import com.revenuecat.purchases.models.PurchaseState
 import com.revenuecat.purchases.models.StoreProduct

diff --git a/...uecat/purchases/amazon/AmazonCacheTest.kt → ...uecat/purchases/amazon/AmazonCacheTest.kt b/...uecat/purchases/amazon/AmazonCacheTest.kt → ...uecat/purchases/amazon/AmazonCacheTest.kt
diff --git a/...t/purchases/amazon/AmazonOfferingsTest.kt → ...t/purchases/amazon/AmazonOfferingsTest.kt b/...t/purchases/amazon/AmazonOfferingsTest.kt → ...t/purchases/amazon/AmazonOfferingsTest.kt
diff --git a/...chases/amazon/BillingFactoryAmazonTest.kt → ...chases/amazon/BillingFactoryAmazonTest.kt b/...chases/amazon/BillingFactoryAmazonTest.kt → ...chases/amazon/BillingFactoryAmazonTest.kt
diff --git a/...at/purchases/amazon/PriceExtractorTest.kt → ...at/purchases/amazon/PriceExtractorTest.kt b/...at/purchases/amazon/PriceExtractorTest.kt → ...at/purchases/amazon/PriceExtractorTest.kt
@@ -4,7 +4,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.math.BigDecimal
 import kotlin.text.Typography.nbsp
 
 @RunWith(AndroidJUnit4::class)

diff --git a/.../purchases/amazon/ProductConverterTest.kt → .../purchases/amazon/ProductConverterTest.kt b/.../purchases/amazon/ProductConverterTest.kt → .../purchases/amazon/ProductConverterTest.kt
@@ -3,7 +3,6 @@ package com.revenuecat.purchases.amazon
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.revenuecat.purchases.amazon.helpers.dummyAmazonProduct
 import com.revenuecat.purchases.models.Period
-import com.revenuecat.purchases.models.SubscriptionOptions
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/...s/amazon/ReceiptToStoreTransactionTest.kt → ...s/amazon/ReceiptToStoreTransactionTest.kt b/...s/amazon/ReceiptToStoreTransactionTest.kt → ...s/amazon/ReceiptToStoreTransactionTest.kt
diff --git a/...ecat/purchases/amazon/StoreProductTest.kt → ...ecat/purchases/amazon/StoreProductTest.kt b/...ecat/purchases/amazon/StoreProductTest.kt → ...ecat/purchases/amazon/StoreProductTest.kt
@@ -2,17 +2,8 @@ package com.revenuecat.purchases.amazon
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.revenuecat.purchases.ProductType
-import com.revenuecat.purchases.amazon.helpers.dummyAmazonProduct
-import com.revenuecat.purchases.amazon.helpers.stubStoreProductForAmazon
-import com.revenuecat.purchases.models.GoogleStoreProduct
-import com.revenuecat.purchases.models.GoogleSubscriptionOption
 import com.revenuecat.purchases.models.Period
 import com.revenuecat.purchases.models.Price
-import com.revenuecat.purchases.models.PricingPhase
-import com.revenuecat.purchases.models.PurchasingData
-import com.revenuecat.purchases.models.RecurrenceMode
-import com.revenuecat.purchases.models.SubscriptionOptions
-import com.revenuecat.purchases.utils.mockProductDetails
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
 import org.json.JSONObject
 import org.junit.Test

diff --git a/...on/AmazonDeviceIdentifiersFetcherTests.kt → ...on/AmazonDeviceIdentifiersFetcherTests.kt b/...on/AmazonDeviceIdentifiersFetcherTests.kt → ...on/AmazonDeviceIdentifiersFetcherTests.kt
diff --git a/.../amazon/handler/ProductDataHandlerTest.kt → .../amazon/handler/ProductDataHandlerTest.kt b/.../amazon/handler/ProductDataHandlerTest.kt → .../amazon/handler/ProductDataHandlerTest.kt
diff --git a/...ses/amazon/handler/PurchaseHandlerTest.kt → ...ses/amazon/handler/PurchaseHandlerTest.kt b/...ses/amazon/handler/PurchaseHandlerTest.kt → ...ses/amazon/handler/PurchaseHandlerTest.kt
diff --git a/...zon/handler/PurchaseUpdatesHandlerTest.kt → ...zon/handler/PurchaseUpdatesHandlerTest.kt b/...zon/handler/PurchaseUpdatesHandlerTest.kt → ...zon/handler/PurchaseUpdatesHandlerTest.kt
diff --git a/...ses/amazon/handler/UserDataHandlerTest.kt → ...ses/amazon/handler/UserDataHandlerTest.kt b/...ses/amazon/handler/UserDataHandlerTest.kt → ...ses/amazon/handler/UserDataHandlerTest.kt
diff --git a/...rchases/amazon/helpers/MockDeviceCache.kt → ...rchases/amazon/helpers/MockDeviceCache.kt b/...rchases/amazon/helpers/MockDeviceCache.kt → ...rchases/amazon/helpers/MockDeviceCache.kt
diff --git a/...lpers/PurchasingServiceProviderForTest.kt → ...lpers/PurchasingServiceProviderForTest.kt b/...lpers/PurchasingServiceProviderForTest.kt → ...lpers/PurchasingServiceProviderForTest.kt
diff --git a/...uecat/purchases/amazon/helpers/dummies.kt → ...uecat/purchases/amazon/helpers/dummies.kt b/...uecat/purchases/amazon/helpers/dummies.kt → ...uecat/purchases/amazon/helpers/dummies.kt
diff --git a/...cat/purchases/amazon/helpers/responses.kt → ...cat/purchases/amazon/helpers/responses.kt b/...cat/purchases/amazon/helpers/responses.kt → ...cat/purchases/amazon/helpers/responses.kt
diff --git a/...onBillingActivityBroadcastReceiverTest.kt → ...onBillingActivityBroadcastReceiverTest.kt b/...onBillingActivityBroadcastReceiverTest.kt → ...onBillingActivityBroadcastReceiverTest.kt
diff --git a/...chasing/ProxyAmazonBillingActivityTest.kt → ...chasing/ProxyAmazonBillingActivityTest.kt b/...chasing/ProxyAmazonBillingActivityTest.kt → ...chasing/ProxyAmazonBillingActivityTest.kt
diff --git a/...chasing/ProxyAmazonBillingDelegateTest.kt → ...chasing/ProxyAmazonBillingDelegateTest.kt b/...chasing/ProxyAmazonBillingDelegateTest.kt → ...chasing/ProxyAmazonBillingDelegateTest.kt