Moves LogHandler and LogLevel to the :core module

core/api/core.api

@@ -1,3 +1,22 @@
+public abstract interface class com/revenuecat/purchases/kmp/LogHandler {
+	public abstract fun d (Ljava/lang/String;Ljava/lang/String;)V
+	public abstract fun e (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+	public abstract fun i (Ljava/lang/String;Ljava/lang/String;)V
+	public abstract fun v (Ljava/lang/String;Ljava/lang/String;)V
+	public abstract fun w (Ljava/lang/String;Ljava/lang/String;)V
+}
+
+public final class com/revenuecat/purchases/kmp/LogLevel : java/lang/Enum {
+	public static final field DEBUG Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static final field ERROR Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static final field INFO Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static final field VERBOSE Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static final field WARN Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lcom/revenuecat/purchases/kmp/LogLevel;
+	public static fun values ()[Lcom/revenuecat/purchases/kmp/LogLevel;
+}
+
 public final class com/revenuecat/purchases/kmp/Purchases {
 	public static final field Companion Lcom/revenuecat/purchases/kmp/Purchases$Companion;
 	public synthetic fun <init> (Lcom/revenuecat/purchases/Purchases;Lkotlin/jvm/internal/DefaultConstructorMarker;)V

core/api/core.klib.api

@@ -6,6 +6,13 @@
 // - Show declarations: true
 
 // Library unique name: <com.revenuecat.purchases:core>
+abstract interface com.revenuecat.purchases.kmp/LogHandler { // com.revenuecat.purchases.kmp/LogHandler|null[0]
+    abstract fun d(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.d|d(kotlin.String;kotlin.String){}[0]
+    abstract fun e(kotlin/String, kotlin/String, kotlin/Throwable?) // com.revenuecat.purchases.kmp/LogHandler.e|e(kotlin.String;kotlin.String;kotlin.Throwable?){}[0]
+    abstract fun i(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.i|i(kotlin.String;kotlin.String){}[0]
+    abstract fun v(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.v|v(kotlin.String;kotlin.String){}[0]
+    abstract fun w(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.w|w(kotlin.String;kotlin.String){}[0]
+}
 final class com.revenuecat.purchases.kmp.ktx/SuccessfulLogin { // com.revenuecat.purchases.kmp.ktx/SuccessfulLogin|null[0]
     constructor <init>(com.revenuecat.purchases.kmp.models/CustomerInfo, kotlin/Boolean) // com.revenuecat.purchases.kmp.ktx/SuccessfulLogin.<init>|<init>(com.revenuecat.purchases.kmp.models.CustomerInfo;kotlin.Boolean){}[0]
     final val created // com.revenuecat.purchases.kmp.ktx/SuccessfulLogin.created|{}created[0]
@@ -168,6 +175,17 @@ final class com.revenuecat.purchases.kmp/PurchasesConfiguration { // com.revenue
     final val verificationMode // com.revenuecat.purchases.kmp/PurchasesConfiguration.verificationMode|{}verificationMode[0]
         final fun <get-verificationMode>(): com.revenuecat.purchases.kmp.models/EntitlementVerificationMode // com.revenuecat.purchases.kmp/PurchasesConfiguration.verificationMode.<get-verificationMode>|<get-verificationMode>(){}[0]
 }
+final enum class com.revenuecat.purchases.kmp/LogLevel : kotlin/Enum<com.revenuecat.purchases.kmp/LogLevel> { // com.revenuecat.purchases.kmp/LogLevel|null[0]
+    enum entry DEBUG // com.revenuecat.purchases.kmp/LogLevel.DEBUG|null[0]
+    enum entry ERROR // com.revenuecat.purchases.kmp/LogLevel.ERROR|null[0]
+    enum entry INFO // com.revenuecat.purchases.kmp/LogLevel.INFO|null[0]
+    enum entry VERBOSE // com.revenuecat.purchases.kmp/LogLevel.VERBOSE|null[0]
+    enum entry WARN // com.revenuecat.purchases.kmp/LogLevel.WARN|null[0]
+    final fun valueOf(kotlin/String): com.revenuecat.purchases.kmp/LogLevel // com.revenuecat.purchases.kmp/LogLevel.valueOf|valueOf#static(kotlin.String){}[0]
+    final fun values(): kotlin/Array<com.revenuecat.purchases.kmp/LogLevel> // com.revenuecat.purchases.kmp/LogLevel.values|values#static(){}[0]
+    final val entries // com.revenuecat.purchases.kmp/LogLevel.entries|#static{}entries[0]
+        final fun <get-entries>(): kotlin.enums/EnumEntries<com.revenuecat.purchases.kmp/LogLevel> // com.revenuecat.purchases.kmp/LogLevel.entries.<get-entries>|<get-entries>#static(){}[0]
+}
 final fun (com.revenuecat.purchases.kmp/Purchases.Companion).com.revenuecat.purchases.kmp/configure(kotlin/String, kotlin/Function1<com.revenuecat.purchases.kmp/PurchasesConfiguration.Builder, kotlin/Unit> =...): com.revenuecat.purchases.kmp/Purchases // com.revenuecat.purchases.kmp/configure|[email protected](kotlin.String;kotlin.Function1<com.revenuecat.purchases.kmp.PurchasesConfiguration.Builder,kotlin.Unit>){}[0]
 final fun com.revenuecat.purchases.kmp/PurchasesConfiguration(kotlin/String, kotlin/Function1<com.revenuecat.purchases.kmp/PurchasesConfiguration.Builder, kotlin/Unit> =...): com.revenuecat.purchases.kmp/PurchasesConfiguration // com.revenuecat.purchases.kmp/PurchasesConfiguration|PurchasesConfiguration(kotlin.String;kotlin.Function1<com.revenuecat.purchases.kmp.PurchasesConfiguration.Builder,kotlin.Unit>){}[0]
 final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.ktx/awaitCustomerInfo(com.revenuecat.purchases.kmp.models/CacheFetchPolicy =...): com.revenuecat.purchases.kmp.models/CustomerInfo // com.revenuecat.purchases.kmp.ktx/awaitCustomerInfo|[email protected](com.revenuecat.purchases.kmp.models.CacheFetchPolicy){}[0]

mappings/src/androidMain/kotlin/com/revenuecat/purchases/kmp/mappings/LogHandler.android.kt → core/src/androidMain/kotlin/com/revenuecat/purchases/kmp/LogHandler.android.kt

@@ -1,15 +1,14 @@
-package com.revenuecat.purchases.kmp.mappings
+package com.revenuecat.purchases.kmp
 
-import com.revenuecat.purchases.kmp.LogHandler
 import com.revenuecat.purchases.LogHandler as AndroidLogHandler
 
-public fun AndroidLogHandler.toLogHandler(): LogHandler =
+internal fun AndroidLogHandler.toLogHandler(): LogHandler =
     when (this) {
         is LogHandlerWrapper -> wrapped
         else -> AndroidLogHandlerWrapper(this)
     }
 
-public fun LogHandler.toAndroidLogHandler(): AndroidLogHandler =
+internal fun LogHandler.toAndroidLogHandler(): AndroidLogHandler =
     when (this) {
         is AndroidLogHandlerWrapper -> wrapped
         else -> LogHandlerWrapper(this)

mappings/src/androidMain/kotlin/com/revenuecat/purchases/kmp/mappings/LogLevel.android.kt → core/src/androidMain/kotlin/com/revenuecat/purchases/kmp/LogLevel.android.kt

@@ -1,9 +1,8 @@
-package com.revenuecat.purchases.kmp.mappings
+package com.revenuecat.purchases.kmp
 
-import com.revenuecat.purchases.kmp.LogLevel
 import com.revenuecat.purchases.LogLevel as AndroidLogLevel
 
-public fun AndroidLogLevel.toLogLevel(): LogLevel =
+internal fun AndroidLogLevel.toLogLevel(): LogLevel =
     when (this) {
         AndroidLogLevel.VERBOSE -> LogLevel.VERBOSE
         AndroidLogLevel.DEBUG -> LogLevel.DEBUG
@@ -12,7 +11,7 @@ public fun AndroidLogLevel.toLogLevel(): LogLevel =
         AndroidLogLevel.ERROR -> LogLevel.ERROR
     }
 
-public fun LogLevel.toAndroidLogLevel(): AndroidLogLevel =
+internal fun LogLevel.toAndroidLogLevel(): AndroidLogLevel =
     when (this) {
         LogLevel.VERBOSE -> AndroidLogLevel.VERBOSE
         LogLevel.DEBUG -> AndroidLogLevel.DEBUG

core/src/androidMain/kotlin/com/revenuecat/purchases/kmp/Purchases.android.kt

@@ -11,16 +11,12 @@ import com.revenuecat.purchases.kmp.di.requireApplication
 import com.revenuecat.purchases.kmp.mappings.toAndroidBillingFeature
 import com.revenuecat.purchases.kmp.mappings.toAndroidCacheFetchPolicy
 import com.revenuecat.purchases.kmp.mappings.toAndroidGoogleReplacementMode
-import com.revenuecat.purchases.kmp.mappings.toAndroidLogHandler
-import com.revenuecat.purchases.kmp.mappings.toAndroidLogLevel
 import com.revenuecat.purchases.kmp.mappings.toAndroidPackage
 import com.revenuecat.purchases.kmp.mappings.toAndroidStore
 import com.revenuecat.purchases.kmp.mappings.toAndroidStoreProduct
 import com.revenuecat.purchases.kmp.mappings.toAndroidSubscriptionOption
 import com.revenuecat.purchases.kmp.mappings.toCustomerInfo
 import com.revenuecat.purchases.kmp.mappings.toHybridString
-import com.revenuecat.purchases.kmp.mappings.toLogHandler
-import com.revenuecat.purchases.kmp.mappings.toLogLevel
 import com.revenuecat.purchases.kmp.mappings.toOfferings
 import com.revenuecat.purchases.kmp.mappings.toPurchasesDelegate
 import com.revenuecat.purchases.kmp.mappings.toPurchasesError

mappings/src/iosMain/kotlin/com/revenuecat/purchases/kmp/mappings/LogHandler.ios.kt → core/src/iosMain/kotlin/com/revenuecat/purchases/kmp/LogHandler.ios.kt

@@ -1,22 +1,21 @@
-package com.revenuecat.purchases.kmp.mappings
+package com.revenuecat.purchases.kmp
 
 import cocoapods.PurchasesHybridCommon.RCLogLevel
 import cocoapods.PurchasesHybridCommon.RCLogLevelDebug
 import cocoapods.PurchasesHybridCommon.RCLogLevelError
 import cocoapods.PurchasesHybridCommon.RCLogLevelInfo
 import cocoapods.PurchasesHybridCommon.RCLogLevelVerbose
 import cocoapods.PurchasesHybridCommon.RCLogLevelWarn
-import com.revenuecat.purchases.kmp.LogHandler
 
 private typealias IosLogHandler = (RCLogLevel, String?) -> Unit
 
-public fun IosLogHandler.toLogHandler(): LogHandler =
+internal fun IosLogHandler.toLogHandler(): LogHandler =
     when (this) {
         is LogHandlerWrapper -> wrapped
         else -> IosLogHandlerWrapper(this)
     }
 
-public fun LogHandler.toIosLogHandler(): IosLogHandler =
+internal fun LogHandler.toIosLogHandler(): IosLogHandler =
     when (this) {
         is IosLogHandlerWrapper -> wrapped
         else -> LogHandlerWrapper(this)

mappings/src/iosMain/kotlin/com/revenuecat/purchases/kmp/mappings/LogLevel.ios.kt → core/src/iosMain/kotlin/com/revenuecat/purchases/kmp/LogLevel.ios.kt

@@ -1,14 +1,13 @@
-package com.revenuecat.purchases.kmp.mappings
+package com.revenuecat.purchases.kmp
 
 import cocoapods.PurchasesHybridCommon.RCLogLevelDebug
 import cocoapods.PurchasesHybridCommon.RCLogLevelError
 import cocoapods.PurchasesHybridCommon.RCLogLevelInfo
 import cocoapods.PurchasesHybridCommon.RCLogLevelVerbose
 import cocoapods.PurchasesHybridCommon.RCLogLevelWarn
-import com.revenuecat.purchases.kmp.LogLevel
 import cocoapods.PurchasesHybridCommon.RCLogLevel as IosLogLevel
 
-public fun IosLogLevel.toLogLevel(): LogLevel =
+internal fun IosLogLevel.toLogLevel(): LogLevel =
     when (this) {
         RCLogLevelVerbose -> LogLevel.VERBOSE
         RCLogLevelDebug -> LogLevel.DEBUG
@@ -18,7 +17,7 @@ public fun IosLogLevel.toLogLevel(): LogLevel =
         else -> error("Unexpected IosLogLevel: $this")
     }
 
-public fun LogLevel.toRcLogLevel(): IosLogLevel =
+internal fun LogLevel.toRcLogLevel(): IosLogLevel =
     when (this) {
         LogLevel.VERBOSE -> RCLogLevelVerbose
         LogLevel.DEBUG -> RCLogLevelDebug

core/src/iosMain/kotlin/com/revenuecat/purchases/kmp/Purchases.ios.kt

@@ -11,18 +11,14 @@ import com.revenuecat.purchases.kmp.mappings.buildStoreTransaction
 import com.revenuecat.purchases.kmp.mappings.toCustomerInfo
 import com.revenuecat.purchases.kmp.mappings.toHybridString
 import com.revenuecat.purchases.kmp.mappings.toIosCacheFetchPolicy
-import com.revenuecat.purchases.kmp.mappings.toIosLogHandler
 import com.revenuecat.purchases.kmp.mappings.toIosPackage
 import com.revenuecat.purchases.kmp.mappings.toIosPromotionalOffer
 import com.revenuecat.purchases.kmp.mappings.toIosStoreProduct
 import com.revenuecat.purchases.kmp.mappings.toIosStoreProductDiscount
-import com.revenuecat.purchases.kmp.mappings.toLogHandler
-import com.revenuecat.purchases.kmp.mappings.toLogLevel
 import com.revenuecat.purchases.kmp.mappings.toOfferings
 import com.revenuecat.purchases.kmp.mappings.toPromotionalOffer
 import com.revenuecat.purchases.kmp.mappings.toPurchasesDelegate
 import com.revenuecat.purchases.kmp.mappings.toPurchasesErrorOrThrow
-import com.revenuecat.purchases.kmp.mappings.toRcLogLevel
 import com.revenuecat.purchases.kmp.mappings.toRcPurchasesDelegate
 import com.revenuecat.purchases.kmp.mappings.toStoreProduct
 import com.revenuecat.purchases.kmp.mappings.toStoreTransaction

models/api/models.api

@@ -1,22 +1,3 @@
-public abstract interface class com/revenuecat/purchases/kmp/LogHandler {
-	public abstract fun d (Ljava/lang/String;Ljava/lang/String;)V
-	public abstract fun e (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-	public abstract fun i (Ljava/lang/String;Ljava/lang/String;)V
-	public abstract fun v (Ljava/lang/String;Ljava/lang/String;)V
-	public abstract fun w (Ljava/lang/String;Ljava/lang/String;)V
-}
-
-public final class com/revenuecat/purchases/kmp/LogLevel : java/lang/Enum {
-	public static final field DEBUG Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static final field ERROR Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static final field INFO Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static final field VERBOSE Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static final field WARN Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lcom/revenuecat/purchases/kmp/LogLevel;
-	public static fun values ()[Lcom/revenuecat/purchases/kmp/LogLevel;
-}
-
 public abstract interface class com/revenuecat/purchases/kmp/PurchasesDelegate {
 	public abstract fun onCustomerInfoUpdated (Lcom/revenuecat/purchases/kmp/models/CustomerInfo;)V
 	public abstract fun onPurchasePromoProduct (Lcom/revenuecat/purchases/kmp/models/StoreProduct;Lkotlin/jvm/functions/Function2;)V

models/api/models.klib.api

@@ -126,13 +126,6 @@ abstract interface com.revenuecat.purchases.kmp.models/SubscriptionOptions { //
     abstract val introOffer // com.revenuecat.purchases.kmp.models/SubscriptionOptions.introOffer|{}introOffer[0]
         abstract fun <get-introOffer>(): com.revenuecat.purchases.kmp.models/SubscriptionOption? // com.revenuecat.purchases.kmp.models/SubscriptionOptions.introOffer.<get-introOffer>|<get-introOffer>(){}[0]
 }
-abstract interface com.revenuecat.purchases.kmp/LogHandler { // com.revenuecat.purchases.kmp/LogHandler|null[0]
-    abstract fun d(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.d|d(kotlin.String;kotlin.String){}[0]
-    abstract fun e(kotlin/String, kotlin/String, kotlin/Throwable?) // com.revenuecat.purchases.kmp/LogHandler.e|e(kotlin.String;kotlin.String;kotlin.Throwable?){}[0]
-    abstract fun i(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.i|i(kotlin.String;kotlin.String){}[0]
-    abstract fun v(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.v|v(kotlin.String;kotlin.String){}[0]
-    abstract fun w(kotlin/String, kotlin/String) // com.revenuecat.purchases.kmp/LogHandler.w|w(kotlin.String;kotlin.String){}[0]
-}
 abstract interface com.revenuecat.purchases.kmp/PurchasesDelegate { // com.revenuecat.purchases.kmp/PurchasesDelegate|null[0]
     abstract fun onCustomerInfoUpdated(com.revenuecat.purchases.kmp.models/CustomerInfo) // com.revenuecat.purchases.kmp/PurchasesDelegate.onCustomerInfoUpdated|onCustomerInfoUpdated(com.revenuecat.purchases.kmp.models.CustomerInfo){}[0]
     abstract fun onPurchasePromoProduct(com.revenuecat.purchases.kmp.models/StoreProduct, kotlin/Function2<kotlin/Function2<com.revenuecat.purchases.kmp.models/PurchasesError, kotlin/Boolean, kotlin/Unit>, kotlin/Function2<com.revenuecat.purchases.kmp.models/StoreTransaction, com.revenuecat.purchases.kmp.models/CustomerInfo, kotlin/Unit>, kotlin/Unit>) // com.revenuecat.purchases.kmp/PurchasesDelegate.onPurchasePromoProduct|onPurchasePromoProduct(com.revenuecat.purchases.kmp.models.StoreProduct;kotlin.Function2<kotlin.Function2<com.revenuecat.purchases.kmp.models.PurchasesError,kotlin.Boolean,kotlin.Unit>,kotlin.Function2<com.revenuecat.purchases.kmp.models.StoreTransaction,com.revenuecat.purchases.kmp.models.CustomerInfo,kotlin.Unit>,kotlin.Unit>){}[0]
@@ -540,17 +533,6 @@ final enum class com.revenuecat.purchases.kmp.models/VerificationResult : kotlin
     final val isVerified // com.revenuecat.purchases.kmp.models/VerificationResult.isVerified|{}isVerified[0]
         final fun <get-isVerified>(): kotlin/Boolean // com.revenuecat.purchases.kmp.models/VerificationResult.isVerified.<get-isVerified>|<get-isVerified>(){}[0]
 }
-final enum class com.revenuecat.purchases.kmp/LogLevel : kotlin/Enum<com.revenuecat.purchases.kmp/LogLevel> { // com.revenuecat.purchases.kmp/LogLevel|null[0]
-    enum entry DEBUG // com.revenuecat.purchases.kmp/LogLevel.DEBUG|null[0]
-    enum entry ERROR // com.revenuecat.purchases.kmp/LogLevel.ERROR|null[0]
-    enum entry INFO // com.revenuecat.purchases.kmp/LogLevel.INFO|null[0]
-    enum entry VERBOSE // com.revenuecat.purchases.kmp/LogLevel.VERBOSE|null[0]
-    enum entry WARN // com.revenuecat.purchases.kmp/LogLevel.WARN|null[0]
-    final fun valueOf(kotlin/String): com.revenuecat.purchases.kmp/LogLevel // com.revenuecat.purchases.kmp/LogLevel.valueOf|valueOf#static(kotlin.String){}[0]
-    final fun values(): kotlin/Array<com.revenuecat.purchases.kmp/LogLevel> // com.revenuecat.purchases.kmp/LogLevel.values|values#static(){}[0]
-    final val entries // com.revenuecat.purchases.kmp/LogLevel.entries|#static{}entries[0]
-        final fun <get-entries>(): kotlin.enums/EnumEntries<com.revenuecat.purchases.kmp/LogLevel> // com.revenuecat.purchases.kmp/LogLevel.entries.<get-entries>|<get-entries>#static(){}[0]
-}
 final val com.revenuecat.purchases.kmp.models/billingPeriod // com.revenuecat.purchases.kmp.models/billingPeriod|@com.revenuecat.purchases.kmp.models.SubscriptionOption{}billingPeriod[0]
     final fun (com.revenuecat.purchases.kmp.models/SubscriptionOption).<get-billingPeriod>(): com.revenuecat.purchases.kmp.models/Period? // com.revenuecat.purchases.kmp.models/billingPeriod.<get-billingPeriod>|<get-billingPeriod>@com.revenuecat.purchases.kmp.models.SubscriptionOption(){}[0]
 final val com.revenuecat.purchases.kmp.models/freePhase // com.revenuecat.purchases.kmp.models/freePhase|@com.revenuecat.purchases.kmp.models.SubscriptionOption{}freePhase[0]