Skip to content

Commit

Permalink
Merge branch 'main' into models-customerinfo
Browse files Browse the repository at this point in the history
# Conflicts:
#	apiTester/src/commonMain/kotlin/com/revenuecat/purchases/kmp/apitester/PurchasesCommonAPI.kt
#	core/api/core.api
#	core/api/core.klib.api
#	core/src/androidMain/kotlin/com/revenuecat/purchases/kmp/Purchases.android.kt
#	core/src/commonMain/kotlin/com/revenuecat/purchases/kmp/MovedModels.kt
#	core/src/commonMain/kotlin/com/revenuecat/purchases/kmp/Purchases.kt
#	core/src/commonMain/kotlin/com/revenuecat/purchases/kmp/PurchasesConfiguration.kt
#	core/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ktx/Coroutines.kt
#	core/src/iosMain/kotlin/com/revenuecat/purchases/kmp/Purchases.ios.kt
#	either/api/either.klib.api
#	either/src/commonMain/kotlin/com/revenuecat/purchases/kmp/either/Either.kt
#	models/api/models.api
#	models/api/models.klib.api
#	result/api/result.klib.api
#	result/src/commonMain/kotlin/com/revenuecat/purchases/kmp/result/Result.kt
  • Loading branch information
JayShortway committed Sep 13, 2024
2 parents 4766548 + e660c69 commit f462734
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion core/api/core.api
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,3 @@ public final class com/revenuecat/purchases/kmp/ktx/SuccessfulPurchase {
public final fun getCustomerInfo ()Lcom/revenuecat/purchases/kmp/models/CustomerInfo;
public final fun getStoreTransaction ()Lcom/revenuecat/purchases/kmp/models/StoreTransaction;
}

1 change: 0 additions & 1 deletion models/api/models.api
Original file line number Diff line number Diff line change
Expand Up @@ -504,4 +504,3 @@ public final class com/revenuecat/purchases/kmp/models/VerificationResult : java
public static fun valueOf (Ljava/lang/String;)Lcom/revenuecat/purchases/kmp/models/VerificationResult;
public static fun values ()[Lcom/revenuecat/purchases/kmp/models/VerificationResult;
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.revenuecat.purchases.kmp.models

import com.revenuecat.purchases.kmp.models.VerificationResult

/**
* This object gives you access to all of the information about the status of a user's entitlements.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.revenuecat.purchases.kmp.models

import com.revenuecat.purchases.kmp.models.VerificationResult

/**
* This class contains all the entitlements associated to the user.
*/
Expand Down

0 comments on commit f462734

Please sign in to comment.