[Paywalls V2] Minimizes Java API (#1942)

RevenueCat · Nov 27, 2024 · 991f8f7 · 991f8f7
1 parent ba75c52
commit 991f8f7
Show file tree

Hide file tree

Showing 22 changed files with 137 additions and 53 deletions.
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/ButtonComponent.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/ButtonComponent.kt
@@ -15,8 +15,8 @@ import kotlinx.serialization.encoding.Encoder
 @Serializable
 @SerialName("button")
 internal data class ButtonComponent(
-    val action: Action,
-    val stack: StackComponent,
+    @get:JvmSynthetic val action: Action,
+    @get:JvmSynthetic val stack: StackComponent,
 ) : PaywallComponent {
 
     @InternalRevenueCatAPI
@@ -31,7 +31,7 @@ internal data class ButtonComponent(
         object NavigateBack : Action
 
         @Serializable
-        data class NavigateTo(val destination: Destination) : Action
+        data class NavigateTo(@get:JvmSynthetic val destination: Destination) : Action
     }
 
     @InternalRevenueCatAPI
@@ -43,13 +43,16 @@ internal data class ButtonComponent(
         object CustomerCenter : Destination
 
         @Serializable
-        data class PrivacyPolicy(val urlLid: String, val method: UrlMethod) : Destination
+        data class PrivacyPolicy(
+            @get:JvmSynthetic val urlLid: String,
+            @get:JvmSynthetic val method: UrlMethod,
+        ) : Destination
 
         @Serializable
-        data class Terms(val urlLid: String, val method: UrlMethod) : Destination
+        data class Terms(@get:JvmSynthetic val urlLid: String, @get:JvmSynthetic val method: UrlMethod) : Destination
 
         @Serializable
-        data class Url(val urlLid: String, val method: UrlMethod) : Destination
+        data class Url(@get:JvmSynthetic val urlLid: String, @get:JvmSynthetic val method: UrlMethod) : Destination
     }
 
     @InternalRevenueCatAPI

diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/ImageComponent.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/ImageComponent.kt
@@ -18,31 +18,45 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName("image")
 internal data class ImageComponent(
+    @get:JvmSynthetic
     val source: ThemeImageUrls,
+    @get:JvmSynthetic
     val size: Size = Size(width = Fill, height = Fit),
+    @get:JvmSynthetic
     @SerialName("override_source_lid")
     val overrideSourceLid: LocalizationKey? = null,
+    @get:JvmSynthetic
     @SerialName("mask_shape")
     val maskShape: MaskShape? = null,
+    @get:JvmSynthetic
     @SerialName("color_overlay")
     val colorOverlay: ColorScheme? = null,
+    @get:JvmSynthetic
     @SerialName("fit_mode")
     val fitMode: FitMode = FIT,
+    @get:JvmSynthetic
     val overrides: ComponentOverrides<PartialImageComponent>? = null,
 ) : PaywallComponent
 
 @InternalRevenueCatAPI
 @Serializable
 internal data class PartialImageComponent(
+    @get:JvmSynthetic
     val visible: Boolean? = true,
+    @get:JvmSynthetic
     val source: ThemeImageUrls? = null,
+    @get:JvmSynthetic
     val size: Size? = null,
+    @get:JvmSynthetic
     @SerialName("override_source_lid")
     val overrideSourceLid: LocalizationKey? = null,
+    @get:JvmSynthetic
     @SerialName("fit_mode")
     val fitMode: FitMode? = null,
+    @get:JvmSynthetic
     @SerialName("mask_shape")
     val maskShape: MaskShape? = null,
+    @get:JvmSynthetic
     @SerialName("color_overlay")
     val colorOverlay: ColorScheme? = null,
 ) : PartialComponent
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PackageComponent.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PackageComponent.kt
@@ -8,9 +8,12 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName("package")
 internal data class PackageComponent(
+    @get:JvmSynthetic
     @SerialName("package_id")
     val packageId: String,
+    @get:JvmSynthetic
     @SerialName("is_selected_by_default")
     val isSelectedByDefault: Boolean,
+    @get:JvmSynthetic
     val stack: StackComponent,
 ) : PaywallComponent
diff --git a/...s/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponent.kt b/...s/src/main/kotlin/com/revenuecat/purchases/paywalls/components/PurchaseButtonComponent.kt
@@ -8,5 +8,5 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName("purchase_button")
 internal data class PurchaseButtonComponent(
-    val stack: StackComponent,
+    @get:JvmSynthetic val stack: StackComponent,
 ) : PaywallComponent
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/StackComponent.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/StackComponent.kt
@@ -21,32 +21,53 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName("stack")
 internal data class StackComponent(
+    @get:JvmSynthetic
     val components: List<PaywallComponent>,
+    @get:JvmSynthetic
     val dimension: Dimension = Vertical(CENTER, START),
+    @get:JvmSynthetic
     val size: Size = Size(width = SizeConstraint.Fill, height = SizeConstraint.Fit),
+    @get:JvmSynthetic
     val spacing: Float? = null,
+    @get:JvmSynthetic
     @SerialName("background_color")
     val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
     val padding: Padding = zero,
+    @get:JvmSynthetic
     val margin: Padding = zero,
+    @get:JvmSynthetic
     val shape: Shape? = null,
+    @get:JvmSynthetic
     val border: Border? = null,
+    @get:JvmSynthetic
     val shadow: Shadow? = null,
+    @get:JvmSynthetic
     val overrides: ComponentOverrides<PartialStackComponent>? = null,
 ) : PaywallComponent
 
 @InternalRevenueCatAPI
 @Serializable
 internal data class PartialStackComponent(
+    @get:JvmSynthetic
     val visible: Boolean? = true,
+    @get:JvmSynthetic
     val dimension: Dimension? = null,
+    @get:JvmSynthetic
     val size: Size? = null,
+    @get:JvmSynthetic
     val spacing: Float? = null,
+    @get:JvmSynthetic
     @SerialName("background_color")
     val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
     val padding: Padding? = null,
+    @get:JvmSynthetic
     val margin: Padding? = null,
+    @get:JvmSynthetic
     val shape: Shape? = null,
+    @get:JvmSynthetic
     val border: Border? = null,
+    @get:JvmSynthetic
     val shadow: Shadow? = null,
 ) : PartialComponent
diff --git a/...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/StickyFooterComponent.kt b/...ses/src/main/kotlin/com/revenuecat/purchases/paywalls/components/StickyFooterComponent.kt
@@ -8,5 +8,6 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName("sticky_footer")
 internal data class StickyFooterComponent(
+    @get:JvmSynthetic
     val stack: StackComponent,
 ) : PaywallComponent
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/TextComponent.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/TextComponent.kt
@@ -26,22 +26,33 @@ import kotlinx.serialization.Serializable
 class TextComponent
 @Suppress("LongParameterList")
 internal constructor(
+    @get:JvmSynthetic
     @SerialName("text_lid")
     val text: LocalizationKey,
+    @get:JvmSynthetic
     val color: ColorScheme,
+    @get:JvmSynthetic
     @SerialName("background_color")
     val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
     @SerialName("font_name")
     val fontName: String? = null,
+    @get:JvmSynthetic
     @SerialName("font_weight")
     val fontWeight: FontWeight = REGULAR,
+    @get:JvmSynthetic
     @SerialName("font_size")
     val fontSize: FontSize = BODY_M,
+    @get:JvmSynthetic
     @SerialName("horizontal_alignment")
     val horizontalAlignment: HorizontalAlignment = CENTER,
+    @get:JvmSynthetic
     val size: Size = Size(width = Fill, height = Fit),
+    @get:JvmSynthetic
     val padding: Padding = zero,
+    @get:JvmSynthetic
     val margin: Padding = zero,
+    @get:JvmSynthetic
     val overrides: ComponentOverrides<PartialTextComponent>? = null,
 ) : PaywallComponent
 
@@ -51,21 +62,32 @@ internal constructor(
 class PartialTextComponent
 @Suppress("LongParameterList")
 internal constructor(
+    @get:JvmSynthetic
     val visible: Boolean? = true,
+    @get:JvmSynthetic
     @SerialName("text_lid")
     val text: LocalizationKey? = null,
+    @get:JvmSynthetic
     val color: ColorScheme? = null,
+    @get:JvmSynthetic
     @SerialName("background_color")
     val backgroundColor: ColorScheme? = null,
+    @get:JvmSynthetic
     @SerialName("font_name")
     val fontName: String? = null,
+    @get:JvmSynthetic
     @SerialName("font_weight")
     val fontWeight: FontWeight? = null,
+    @get:JvmSynthetic
     @SerialName("font_size")
     val fontSize: FontSize? = null,
+    @get:JvmSynthetic
     @SerialName("horizontal_alignment")
     val horizontalAlignment: HorizontalAlignment? = null,
+    @get:JvmSynthetic
     val size: Size? = null,
+    @get:JvmSynthetic
     val padding: Padding? = null,
+    @get:JvmSynthetic
     val margin: Padding? = null,
 ) : PartialComponent
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/Background.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/Background.kt
@@ -11,9 +11,9 @@ import kotlinx.serialization.Serializable
 internal sealed interface Background {
     @Serializable
     @SerialName("color")
-    data class Color(val value: ColorScheme) : Background
+    data class Color(@get:JvmSynthetic val value: ColorScheme) : Background
 
     @Serializable
     @SerialName("image")
-    data class Image(val value: ThemeImageUrls) : Background
+    data class Image(@get:JvmSynthetic val value: ThemeImageUrls) : Background
 }
diff --git a/...src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverrides.kt b/...src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentOverrides.kt
@@ -9,23 +9,23 @@ import kotlinx.serialization.Serializable
 @Poko
 @Serializable
 class ComponentOverrides<T : PartialComponent> internal constructor(
-    val introOffer: T? = null,
-    val states: ComponentStates<T>? = null,
-    val conditions: ComponentConditions<T>? = null,
+    @get:JvmSynthetic val introOffer: T? = null,
+    @get:JvmSynthetic val states: ComponentStates<T>? = null,
+    @get:JvmSynthetic val conditions: ComponentConditions<T>? = null,
 )
 
 @InternalRevenueCatAPI
 @Poko
 @Serializable
 class ComponentStates<T : PartialComponent> internal constructor(
-    val selected: T? = null,
+    @get:JvmSynthetic val selected: T? = null,
 )
 
 @InternalRevenueCatAPI
 @Poko
 @Serializable
 class ComponentConditions<T : PartialComponent> internal constructor(
-    val compact: T? = null,
-    val medium: T? = null,
-    val expanded: T? = null,
+    @get:JvmSynthetic val compact: T? = null,
+    @get:JvmSynthetic val medium: T? = null,
+    @get:JvmSynthetic val expanded: T? = null,
 )
diff --git a/...s/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentsConfig.kt b/...s/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/ComponentsConfig.kt
@@ -9,14 +9,15 @@ import kotlinx.serialization.Serializable
 @InternalRevenueCatAPI
 @Serializable
 internal data class ComponentsConfig(
-    val base: PaywallComponentsConfig,
+    @get:JvmSynthetic val base: PaywallComponentsConfig,
 )
 
 @InternalRevenueCatAPI
 @Serializable
 internal data class PaywallComponentsConfig(
-    val stack: StackComponent,
-    val background: Background,
+    @get:JvmSynthetic val stack: StackComponent,
+    @get:JvmSynthetic val background: Background,
+    @get:JvmSynthetic
     @SerialName("sticky_footer")
     val stickyFooter: StickyFooterComponent? = null,
 )
diff --git a/...hases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/Localization.kt b/...hases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/common/Localization.kt
@@ -16,12 +16,12 @@ import kotlinx.serialization.encoding.Encoder
 @InternalRevenueCatAPI
 @Serializable
 @JvmInline
-internal value class LocaleId(val value: String)
+internal value class LocaleId(@get:JvmSynthetic val value: String)
 
 @InternalRevenueCatAPI
 @Serializable
 @JvmInline
-value class LocalizationKey internal constructor(val value: String)
+value class LocalizationKey internal constructor(@get:JvmSynthetic val value: String)
 
 @InternalRevenueCatAPI
 internal typealias LocalizationDictionary = Map<LocalizationKey, LocalizationData>
@@ -34,11 +34,11 @@ internal typealias LocalizationDictionary = Map<LocalizationKey, LocalizationDat
 internal sealed interface LocalizationData {
     @Serializable
     @JvmInline
-    value class Text(val value: String) : LocalizationData
+    value class Text(@get:JvmSynthetic val value: String) : LocalizationData
 
     @Serializable
     @JvmInline
-    value class Image(val value: ThemeImageUrls) : LocalizationData
+    value class Image(@get:JvmSynthetic val value: ThemeImageUrls) : LocalizationData
 }
 
 @OptIn(InternalRevenueCatAPI::class)

diff --git a/.../main/kotlin/com/revenuecat/purchases/paywalls/components/common/PaywallComponentsData.kt b/.../main/kotlin/com/revenuecat/purchases/paywalls/components/common/PaywallComponentsData.kt
@@ -9,16 +9,22 @@ import java.net.URL
 @InternalRevenueCatAPI
 @Serializable
 internal data class PaywallComponentsData(
+    @get:JvmSynthetic
     @SerialName("template_name")
     val templateName: String,
+    @get:JvmSynthetic
     @Serializable(with = URLSerializer::class)
     @SerialName("asset_base_url")
     val assetBaseURL: URL,
+    @get:JvmSynthetic
     @SerialName("components_config")
     val componentsConfig: ComponentsConfig,
+    @get:JvmSynthetic
     @SerialName("components_localizations")
     val componentsLocalizations: Map<LocaleId, LocalizationDictionary>,
+    @get:JvmSynthetic
     @SerialName("default_locale")
     val defaultLocaleIdentifier: LocaleId,
+    @get:JvmSynthetic
     val revision: Int = 0,
 )
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Border.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/components/properties/Border.kt
@@ -6,6 +6,8 @@ import kotlinx.serialization.Serializable
 @InternalRevenueCatAPI
 @Serializable
 internal data class Border(
+    @get:JvmSynthetic
     val color: ColorScheme,
+    @get:JvmSynthetic
     val width: Double,
 )