Prepare for release 2.2.5

RevenueCat · May 31, 2019 · 7e1e792 · 7e1e792
1 parent 7cfe566
commit 7e1e792
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.5
+
+- Removes duplicated makePurchase call in deprecated makePurchase method.
+
 ## 2.2.4
 
 - Fixes Proguard issue

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 GROUP=com.revenuecat.purchases
 
-VERSION_NAME=2.3.0-SNAPSHOT
+VERSION_NAME=2.2.5
 
 POM_DESCRIPTION=Mobile subscriptions in hours, not months.
 POM_URL=https://github.com/RevenueCat/purchases-android

diff --git a/purchases/build.gradle b/purchases/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "2.3.0-SNAPSHOT"
+        versionName "2.2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-proguard-rules.pro'

diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/Purchases.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/Purchases.kt
@@ -30,6 +30,7 @@ import com.revenuecat.purchases.util.AdvertisingIdClient
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.ArrayList
+import java.util.Collections.emptyMap
 import java.util.Date
 import java.util.HashMap
 import java.util.UUID
@@ -291,12 +292,6 @@ class Purchases @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) intern
 
         userPurchasing?.let { appUserID ->
             billingWrapper.makePurchaseAsync(activity, appUserID, sku, oldSkus, skuType)
-
-            billingWrapper.querySkuDetailsAsync(skuType, listOf(sku), {
-                billingWrapper.makePurchaseAsync(activity, appUserID, sku, oldSkus, skuType)
-            }, { error ->
-                listener.onError(error, false)
-            })
         } ?: dispatch {
             listener.onError(PurchasesError(PurchasesErrorCode.OperationAlreadyInProgressError), false)
         }
@@ -986,7 +981,7 @@ class Purchases @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) intern
          * Current version of the Purchases SDK
          */
         @JvmStatic
-        val frameworkVersion = "2.3.0-SNAPSHOT"
+        val frameworkVersion = "2.2.5"
 
         /**
          * Configures an instance of the Purchases SDK with a specified API key. The instance will

diff --git a/purchases/src/test/java/com/revenuecat/purchases/PurchasesTest.kt b/purchases/src/test/java/com/revenuecat/purchases/PurchasesTest.kt
@@ -35,6 +35,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import java.util.ArrayList
+import java.util.Collections.emptyList
+import java.util.ConcurrentModificationException
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -167,13 +169,19 @@ class PurchasesTest {
         val sku = "onemonth_freetrial"
         val oldSkus = ArrayList<String>()
 
+        every {
+            mockBillingWrapper.querySkuDetailsAsync(any(), any(), captureLambda(), any())
+        } answers {
+            lambda<(List<Purchase>) -> Unit>().captured.invoke(listOf(mockk(relaxed = true)))
+        }
+
         purchases.makePurchaseWith(
             activity,
             sku,
             BillingClient.SkuType.SUBS
         ) { _, _ -> }
 
-        verify {
+        verify (exactly = 1) {
             mockBillingWrapper.makePurchaseAsync(
                 eq(activity),
                 eq(appUserId),