Skip to content

Commit

Permalink
Downgrades Kotlin to 1.9.23, updates Compose to 1.6.11 to avoid Compo…
Browse files Browse the repository at this point in the history
…se<->K2 compilation error (#111)
  • Loading branch information
JayShortway authored Jun 26, 2024
1 parent 1b86be3 commit 0f42914
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 54 deletions.
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ plugins {
alias(libs.plugins.android.application).apply(false)
alias(libs.plugins.android.library).apply(false)
alias(libs.plugins.jetbrains.compose).apply(false)
alias(libs.plugins.compose.compiler).apply(false)
alias(libs.plugins.kotlin.multiplatform).apply(false)
alias(libs.plugins.kotlin.cocoapods).apply(false)
alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
Expand Down
1 change: 0 additions & 1 deletion composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.compose.compiler)
}

kotlin {
Expand Down
42 changes: 21 additions & 21 deletions core/api/core.klib.api

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions core/core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
spec.summary = ''
spec.vendored_frameworks = 'build/cocoapods/framework/Purchases.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '11.0'
spec.ios.deployment_target = '11.0'
spec.dependency 'PurchasesHybridCommon', '10.7.0'

if !Dir.exist?('build/cocoapods/framework/Purchases.framework') || Dir.empty?('build/cocoapods/framework/Purchases.framework')
Expand All @@ -22,10 +22,6 @@ Pod::Spec.new do |spec|
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
end

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':core',
'PRODUCT_MODULE_NAME' => 'Purchases',
Expand Down
10 changes: 5 additions & 5 deletions either/api/either.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ final class com.revenuecat.purchases.kmp.either/FailedPurchase { // com.revenuec
constructor <init>(com.revenuecat.purchases.kmp/PurchasesError, kotlin/Boolean) // com.revenuecat.purchases.kmp.either/FailedPurchase.<init>|<init>(com.revenuecat.purchases.kmp.PurchasesError;kotlin.Boolean){}[0]
final fun component1(): com.revenuecat.purchases.kmp/PurchasesError // com.revenuecat.purchases.kmp.either/FailedPurchase.component1|component1(){}[0]
final fun component2(): kotlin/Boolean // com.revenuecat.purchases.kmp.either/FailedPurchase.component2|component2(){}[0]
final fun copy(com.revenuecat.purchases.kmp/PurchasesError = ..., kotlin/Boolean = ...): com.revenuecat.purchases.kmp.either/FailedPurchase // com.revenuecat.purchases.kmp.either/FailedPurchase.copy|copy(com.revenuecat.purchases.kmp.PurchasesError;kotlin.Boolean){}[0]
final fun copy(com.revenuecat.purchases.kmp/PurchasesError =..., kotlin/Boolean =...): com.revenuecat.purchases.kmp.either/FailedPurchase // com.revenuecat.purchases.kmp.either/FailedPurchase.copy|copy(com.revenuecat.purchases.kmp.PurchasesError;kotlin.Boolean){}[0]
final fun equals(kotlin/Any?): kotlin/Boolean // com.revenuecat.purchases.kmp.either/FailedPurchase.equals|equals(kotlin.Any?){}[0]
final fun hashCode(): kotlin/Int // com.revenuecat.purchases.kmp.either/FailedPurchase.hashCode|hashCode(){}[0]
final fun toString(): kotlin/String // com.revenuecat.purchases.kmp.either/FailedPurchase.toString|toString(){}[0]
Expand All @@ -19,17 +19,17 @@ final class com.revenuecat.purchases.kmp.either/FailedPurchase { // com.revenuec
final val userCancelled // com.revenuecat.purchases.kmp.either/FailedPurchase.userCancelled|{}userCancelled[0]
final fun <get-userCancelled>(): kotlin/Boolean // com.revenuecat.purchases.kmp.either/FailedPurchase.userCancelled.<get-userCancelled>|<get-userCancelled>(){}[0]
}
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitCustomerInfoEither(com.revenuecat.purchases.kmp/CacheFetchPolicy = ...): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCCustomerInfo> // com.revenuecat.purchases.kmp.either/awaitCustomerInfoEither|[email protected](com.revenuecat.purchases.kmp.CacheFetchPolicy){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitCustomerInfoEither(com.revenuecat.purchases.kmp/CacheFetchPolicy =...): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCCustomerInfo> // com.revenuecat.purchases.kmp.either/awaitCustomerInfoEither|[email protected](com.revenuecat.purchases.kmp.CacheFetchPolicy){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitGetProductsEither(kotlin.collections/List<kotlin/String>): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, kotlin.collections/List<cocoapods.PurchasesHybridCommon/RCStoreProduct>> // com.revenuecat.purchases.kmp.either/awaitGetProductsEither|[email protected](kotlin.collections.List<kotlin.String>){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitLogInEither(kotlin/String): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, com.revenuecat.purchases.kmp.ktx/SuccessfulLogin> // com.revenuecat.purchases.kmp.either/awaitLogInEither|[email protected](kotlin.String){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitLogOutEither(): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCCustomerInfo> // com.revenuecat.purchases.kmp.either/awaitLogOutEither|[email protected](){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitOfferingsEither(): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCOfferings> // com.revenuecat.purchases.kmp.either/awaitOfferingsEither|[email protected](){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPromotionalOfferEither(cocoapods.PurchasesHybridCommon/RCStoreProductDiscount, cocoapods.PurchasesHybridCommon/RCStoreProduct): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCPromotionalOffer> // com.revenuecat.purchases.kmp.either/awaitPromotionalOfferEither|awaitPromotionalOfferEither@com.revenuecat.purchases.kmp.Purchases(cocoapods.PurchasesHybridCommon.RCStoreProductDiscount;cocoapods.PurchasesHybridCommon.RCStoreProduct){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCPackage, cocoapods.PurchasesHybridCommon/RCPromotionalOffer): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCPackage;cocoapods.PurchasesHybridCommon.RCPromotionalOffer){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCPackage, kotlin/Boolean? = ..., kotlin/String? = ..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode = ...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCPackage;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCPackage, kotlin/Boolean? =..., kotlin/String? =..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode =...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCPackage;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCStoreProduct, cocoapods.PurchasesHybridCommon/RCPromotionalOffer): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCStoreProduct;cocoapods.PurchasesHybridCommon.RCPromotionalOffer){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCStoreProduct, kotlin/Boolean? = ..., kotlin/String? = ..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode = ...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCStoreProduct;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(com.revenuecat.purchases.kmp.models/SubscriptionOption, kotlin/Boolean? = ..., kotlin/String? = ..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode = ...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](com.revenuecat.purchases.kmp.models.SubscriptionOption;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(cocoapods.PurchasesHybridCommon/RCStoreProduct, kotlin/Boolean? =..., kotlin/String? =..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode =...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](cocoapods.PurchasesHybridCommon.RCStoreProduct;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitPurchaseEither(com.revenuecat.purchases.kmp.models/SubscriptionOption, kotlin/Boolean? =..., kotlin/String? =..., com.revenuecat.purchases.kmp.models/GoogleReplacementMode =...): arrow.core/Either<com.revenuecat.purchases.kmp.either/FailedPurchase, com.revenuecat.purchases.kmp.ktx/SuccessfulPurchase> // com.revenuecat.purchases.kmp.either/awaitPurchaseEither|[email protected](com.revenuecat.purchases.kmp.models.SubscriptionOption;kotlin.Boolean?;kotlin.String?;com.revenuecat.purchases.kmp.models.GoogleReplacementMode){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitRestoreEither(): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCCustomerInfo> // com.revenuecat.purchases.kmp.either/awaitRestoreEither|[email protected](){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitSyncAttributesAndOfferingsIfNeededEither(): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCOfferings> // com.revenuecat.purchases.kmp.either/awaitSyncAttributesAndOfferingsIfNeededEither|awaitSyncAttributesAndOfferingsIfNeededEither@com.revenuecat.purchases.kmp.Purchases(){}[0]
final suspend fun (com.revenuecat.purchases.kmp/Purchases).com.revenuecat.purchases.kmp.either/awaitSyncPurchasesEither(): arrow.core/Either<com.revenuecat.purchases.kmp/PurchasesError, cocoapods.PurchasesHybridCommon/RCCustomerInfo> // com.revenuecat.purchases.kmp.either/awaitSyncPurchasesEither|[email protected](){}[0]
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android-minSdk = "21"
android-targetSdk = "34"
compose = "1.6.7"
java = "1.8"
kotlin = "2.0.0"
kotlin = "1.9.23"
revenuecat-common = "10.7.0"
revenuecat-kmp = "0.5.0-SNAPSHOT"

Expand All @@ -28,8 +28,7 @@ arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" }
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
codingfeline-buildkonfig = { id = "com.codingfeline.buildkonfig", version = "0.15.1" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
jetbrains-compose = { id = "org.jetbrains.compose", version = "1.6.10" }
jetbrains-compose = { id = "org.jetbrains.compose", version = "1.6.11" }
kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.15.0-Beta.2" }
Expand Down
Loading

0 comments on commit 0f42914

Please sign in to comment.