From ba5465f69c3e85792fd46ff65d562fdd080f98cc Mon Sep 17 00:00:00 2001 From: Cesar de la Vega Date: Wed, 10 Jul 2024 14:02:51 +0200 Subject: [PATCH] Remove leftovers `ExperimentalPreviewRevenueCatUIPurchasesAPI` (#1778) Some leftovers from #1743 --- .../com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java | 2 -- .../apitester/java/revenuecatui/FontProviderAPI.java | 2 +- .../java/revenuecatui/PaywallActivityLauncherAPI.java | 1 - .../apitester/java/revenuecatui/PaywallFooterViewAPI.java | 1 - .../apitester/java/revenuecatui/PaywallResultAPI.java | 3 --- .../revenuecat/apitester/java/revenuecatui/PaywallViewAPI.java | 1 - .../purchases/ui/revenuecatui/data/PaywallViewModel.kt | 3 +-- .../purchases/ui/revenuecatui/data/PaywallViewModelTest.kt | 3 +-- .../ui/revenuecatui/snapshottests/TemplateSnapshotTest.kt | 1 - 9 files changed, 3 insertions(+), 14 deletions(-) diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java index f3be657199..043d957f07 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/DeprecatedPurchasesAPI.java @@ -16,8 +16,6 @@ import com.revenuecat.purchases.models.StoreTransaction; import com.revenuecat.purchases.models.SubscriptionOption; -import kotlin.Unit; - @SuppressWarnings({"unused"}) final class DeprecatedPurchasesAPI { static void check(final Purchases purchases, diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/FontProviderAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/FontProviderAPI.java index 2421fb28ef..57c6b3cd04 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/FontProviderAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/FontProviderAPI.java @@ -2,10 +2,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.OptIn; import androidx.compose.ui.text.font.FontFamily; import androidx.compose.ui.text.font.FontWeight; import androidx.compose.ui.text.googlefonts.GoogleFont; + import com.revenuecat.purchases.ui.revenuecatui.fonts.CustomFontProvider; import com.revenuecat.purchases.ui.revenuecatui.fonts.CustomParcelizableFontProvider; import com.revenuecat.purchases.ui.revenuecatui.fonts.FontProvider; diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallActivityLauncherAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallActivityLauncherAPI.java index ba46141282..f09ca815e1 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallActivityLauncherAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallActivityLauncherAPI.java @@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment; import com.revenuecat.purchases.Offering; -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI; import com.revenuecat.purchases.ui.revenuecatui.activity.PaywallActivityLauncher; import com.revenuecat.purchases.ui.revenuecatui.activity.PaywallDisplayCallback; import com.revenuecat.purchases.ui.revenuecatui.activity.PaywallResultHandler; diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallFooterViewAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallFooterViewAPI.java index ec46f0460b..8593f11c38 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallFooterViewAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallFooterViewAPI.java @@ -4,7 +4,6 @@ import android.util.AttributeSet; import com.revenuecat.purchases.Offering; -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI; import com.revenuecat.purchases.ui.revenuecatui.PaywallListener; import com.revenuecat.purchases.ui.revenuecatui.fonts.FontProvider; import com.revenuecat.purchases.ui.revenuecatui.views.PaywallFooterView; diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallResultAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallResultAPI.java index cac371ec49..e5c8d5f310 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallResultAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallResultAPI.java @@ -1,14 +1,11 @@ package com.revenuecat.apitester.java.revenuecatui; -import android.os.Parcel; import android.os.Parcelable; import androidx.activity.result.ActivityResultCallback; -import androidx.annotation.NonNull; import com.revenuecat.purchases.CustomerInfo; import com.revenuecat.purchases.PurchasesError; -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI; import com.revenuecat.purchases.ui.revenuecatui.activity.PaywallResult; import com.revenuecat.purchases.ui.revenuecatui.activity.PaywallResultHandler; diff --git a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallViewAPI.java b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallViewAPI.java index 79e12c4233..8a37bb095f 100644 --- a/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallViewAPI.java +++ b/api-tester/src/defaults/java/com/revenuecat/apitester/java/revenuecatui/PaywallViewAPI.java @@ -4,7 +4,6 @@ import android.util.AttributeSet; import com.revenuecat.purchases.Offering; -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI; import com.revenuecat.purchases.ui.revenuecatui.PaywallListener; import com.revenuecat.purchases.ui.revenuecatui.fonts.FontProvider; import com.revenuecat.purchases.ui.revenuecatui.views.PaywallView; diff --git a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt index 951eaa1778..b88c9cd61b 100644 --- a/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt +++ b/ui/revenuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModel.kt @@ -18,7 +18,6 @@ import com.revenuecat.purchases.PurchasesErrorCode import com.revenuecat.purchases.PurchasesException import com.revenuecat.purchases.paywalls.events.PaywallEvent import com.revenuecat.purchases.paywalls.events.PaywallEventType -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI import com.revenuecat.purchases.ui.revenuecatui.PaywallListener import com.revenuecat.purchases.ui.revenuecatui.PaywallMode import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions @@ -60,7 +59,7 @@ internal interface PaywallViewModel { fun clearActionError() } -@OptIn(ExperimentalPreviewRevenueCatUIPurchasesAPI::class, ExperimentalPreviewRevenueCatPurchasesAPI::class) +@OptIn(ExperimentalPreviewRevenueCatPurchasesAPI::class) @Suppress("TooManyFunctions", "LongParameterList") internal class PaywallViewModelImpl( override val resourceProvider: ResourceProvider, diff --git a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModelTest.kt b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModelTest.kt index e5651c2ba0..32abd2322d 100644 --- a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModelTest.kt +++ b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/data/PaywallViewModelTest.kt @@ -17,7 +17,6 @@ import com.revenuecat.purchases.models.StoreTransaction import com.revenuecat.purchases.models.Transaction import com.revenuecat.purchases.paywalls.PaywallData import com.revenuecat.purchases.paywalls.events.PaywallEventType -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI import com.revenuecat.purchases.ui.revenuecatui.PaywallListener import com.revenuecat.purchases.ui.revenuecatui.PaywallMode import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions @@ -45,7 +44,7 @@ import org.junit.runner.RunWith import java.util.Date import java.util.UUID -@OptIn(ExperimentalPreviewRevenueCatUIPurchasesAPI::class, ExperimentalPreviewRevenueCatPurchasesAPI::class) +@OptIn(ExperimentalPreviewRevenueCatPurchasesAPI::class) @RunWith(AndroidJUnit4::class) class PaywallViewModelTest { private val defaultOffering = TestData.template2Offering diff --git a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/snapshottests/TemplateSnapshotTest.kt b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/snapshottests/TemplateSnapshotTest.kt index ff82507048..d25cbce660 100644 --- a/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/snapshottests/TemplateSnapshotTest.kt +++ b/ui/revenuecatui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/snapshottests/TemplateSnapshotTest.kt @@ -1,7 +1,6 @@ package com.revenuecat.purchases.ui.revenuecatui.snapshottests import com.revenuecat.purchases.Offering -import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI import com.revenuecat.purchases.ui.revenuecatui.InternalPaywall import com.revenuecat.purchases.ui.revenuecatui.PaywallMode import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions