From 85b890a914a27b77b09829fa96cd18c444df3660 Mon Sep 17 00:00:00 2001 From: JayShortway <29483617+JayShortway@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:06:27 +0200 Subject: [PATCH] Corrects the artifactId of the :paywalls module and renames it to :revenuecatui. (#86) --- build.gradle.kts | 10 +++++++++- composeApp/build.gradle.kts | 2 +- {paywalls => revenuecatui}/.gitignore | 0 .../api/revenuecatui.api | 0 .../api/revenuecatui.klib.api | 2 +- {paywalls => revenuecatui}/build.gradle.kts | 0 .../revenuecatui.podspec | 18 +++++++++--------- .../purchases/kmp/ui/revenuecatui/Paywall.kt | 0 .../kmp/ui/revenuecatui/PaywallFooter.kt | 0 .../kmp/ui/revenuecatui/PaywallOptionsKtx.kt | 0 .../purchases/kmp/ui/revenuecatui/Paywall.kt | 0 .../kmp/ui/revenuecatui/PaywallFooter.kt | 0 .../kmp/ui/revenuecatui/PaywallListener.kt | 0 .../kmp/ui/revenuecatui/PaywallOptions.kt | 0 .../purchases/kmp/ui/revenuecatui/Paywall.kt | 0 .../kmp/ui/revenuecatui/PaywallFooter.kt | 0 .../kmp/ui/revenuecatui/PaywallOptionsKtx.kt | 0 .../kmp/ui/revenuecatui/UIKitPaywall.kt | 0 settings.gradle.kts | 2 +- 19 files changed, 21 insertions(+), 13 deletions(-) rename {paywalls => revenuecatui}/.gitignore (100%) rename paywalls/api/paywalls.api => revenuecatui/api/revenuecatui.api (100%) rename paywalls/api/paywalls.klib.api => revenuecatui/api/revenuecatui.klib.api (99%) rename {paywalls => revenuecatui}/build.gradle.kts (100%) rename paywalls/paywalls.podspec => revenuecatui/revenuecatui.podspec (74%) rename {paywalls => revenuecatui}/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt (100%) rename {paywalls => revenuecatui}/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt (100%) rename {paywalls => revenuecatui}/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt (100%) rename {paywalls => revenuecatui}/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt (100%) rename {paywalls => revenuecatui}/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt (100%) rename {paywalls => revenuecatui}/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallListener.kt (100%) rename {paywalls => revenuecatui}/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptions.kt (100%) rename {paywalls => revenuecatui}/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt (100%) rename {paywalls => revenuecatui}/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt (100%) rename {paywalls => revenuecatui}/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt (100%) rename {paywalls => revenuecatui}/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/UIKitPaywall.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 6f005fca..fac8b35e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,9 +29,17 @@ allprojects { publishToMavenCentral(SonatypeHost.DEFAULT, automaticRelease = true) signAllPublications() + // We override the artifact ID of :revenuecatui for consistency with the other SDKs. We + // could not name our Gradle module :ui, because this somehow conflicts with compose.ui + // in the iosMain source set. We can retry this at a later time. + val artifactIdSuffix = when (project.name) { + "revenuecatui" -> "ui" + else -> project.name + } + coordinates( groupId = group.toString(), - artifactId = "purchases-kmp-${project.name}", + artifactId = "purchases-kmp-$artifactIdSuffix", version = version.toString() ) pom { diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index c1e6b203..d6a91543 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -46,7 +46,7 @@ kotlin { implementation(projects.result) implementation(projects.either) implementation(projects.datetime) - implementation(projects.paywalls) + implementation(projects.revenuecatui) } androidMain.dependencies { implementation(libs.androidx.compose.ui.tooling.preview) diff --git a/paywalls/.gitignore b/revenuecatui/.gitignore similarity index 100% rename from paywalls/.gitignore rename to revenuecatui/.gitignore diff --git a/paywalls/api/paywalls.api b/revenuecatui/api/revenuecatui.api similarity index 100% rename from paywalls/api/paywalls.api rename to revenuecatui/api/revenuecatui.api diff --git a/paywalls/api/paywalls.klib.api b/revenuecatui/api/revenuecatui.klib.api similarity index 99% rename from paywalls/api/paywalls.klib.api rename to revenuecatui/api/revenuecatui.klib.api index 5cd7142b..9f8b288d 100644 --- a/paywalls/api/paywalls.klib.api +++ b/revenuecatui/api/revenuecatui.klib.api @@ -5,7 +5,7 @@ // - Show manifest properties: true // - Show declarations: true -// Library unique name: +// Library unique name: abstract interface com.revenuecat.purchases.kmp.ui.revenuecatui/PaywallListener { // com.revenuecat.purchases.kmp.ui.revenuecatui/PaywallListener|null[0] open fun onPurchaseCancelled() // com.revenuecat.purchases.kmp.ui.revenuecatui/PaywallListener.onPurchaseCancelled|onPurchaseCancelled(){}[0] open fun onPurchaseCompleted(cocoapods.PurchasesHybridCommon/RCCustomerInfo, cocoapods.PurchasesHybridCommon/RCStoreTransaction) // com.revenuecat.purchases.kmp.ui.revenuecatui/PaywallListener.onPurchaseCompleted|onPurchaseCompleted(cocoapods.PurchasesHybridCommon.RCCustomerInfo;cocoapods.PurchasesHybridCommon.RCStoreTransaction){}[0] diff --git a/paywalls/build.gradle.kts b/revenuecatui/build.gradle.kts similarity index 100% rename from paywalls/build.gradle.kts rename to revenuecatui/build.gradle.kts diff --git a/paywalls/paywalls.podspec b/revenuecatui/revenuecatui.podspec similarity index 74% rename from paywalls/paywalls.podspec rename to revenuecatui/revenuecatui.podspec index 9bd46b1a..42facb75 100644 --- a/paywalls/paywalls.podspec +++ b/revenuecatui/revenuecatui.podspec @@ -1,23 +1,23 @@ Pod::Spec.new do |spec| - spec.name = 'paywalls' + spec.name = 'revenuecatui' spec.version = '1.0' spec.homepage = '' spec.source = { :http=> ''} spec.authors = '' spec.license = '' spec.summary = '' - spec.vendored_frameworks = 'build/cocoapods/framework/paywalls.framework' + spec.vendored_frameworks = 'build/cocoapods/framework/revenuecatui.framework' spec.libraries = 'c++' spec.ios.deployment_target = '11.0' spec.dependency 'PurchasesHybridCommonUI', '10.7.0' - if !Dir.exist?('build/cocoapods/framework/paywalls.framework') || Dir.empty?('build/cocoapods/framework/paywalls.framework') + if !Dir.exist?('build/cocoapods/framework/revenuecatui.framework') || Dir.empty?('build/cocoapods/framework/revenuecatui.framework') raise " - Kotlin framework 'paywalls' doesn't exist yet, so a proper Xcode project can't be generated. + Kotlin framework 'revenuecatui' doesn't exist yet, so a proper Xcode project can't be generated. 'pod install' should be executed after running ':generateDummyFramework' Gradle task: - ./gradlew :paywalls:generateDummyFramework + ./gradlew :revenuecatui:generateDummyFramework Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" end @@ -27,13 +27,13 @@ Pod::Spec.new do |spec| } spec.pod_target_xcconfig = { - 'KOTLIN_PROJECT_PATH' => ':paywalls', - 'PRODUCT_MODULE_NAME' => 'paywalls', + 'KOTLIN_PROJECT_PATH' => ':revenuecatui', + 'PRODUCT_MODULE_NAME' => 'revenuecatui', } spec.script_phases = [ { - :name => 'Build paywalls', + :name => 'Build revenuecatui', :execution_position => :before_compile, :shell_path => '/bin/sh', :script => <<-SCRIPT @@ -51,4 +51,4 @@ Pod::Spec.new do |spec| } ] spec.resources = ['build/compose/cocoapods/compose-resources'] -end \ No newline at end of file +end diff --git a/paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt b/revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt similarity index 100% rename from paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt rename to revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt diff --git a/paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt b/revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt similarity index 100% rename from paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt rename to revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt diff --git a/paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt b/revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt similarity index 100% rename from paywalls/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt rename to revenuecatui/src/androidMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt diff --git a/paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt b/revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt similarity index 100% rename from paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt rename to revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt diff --git a/paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt b/revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt similarity index 100% rename from paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt rename to revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt diff --git a/paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallListener.kt b/revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallListener.kt similarity index 100% rename from paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallListener.kt rename to revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallListener.kt diff --git a/paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptions.kt b/revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptions.kt similarity index 100% rename from paywalls/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptions.kt rename to revenuecatui/src/commonMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptions.kt diff --git a/paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt b/revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt similarity index 100% rename from paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt rename to revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/Paywall.kt diff --git a/paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt b/revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt similarity index 100% rename from paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt rename to revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallFooter.kt diff --git a/paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt b/revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt similarity index 100% rename from paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt rename to revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/PaywallOptionsKtx.kt diff --git a/paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/UIKitPaywall.kt b/revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/UIKitPaywall.kt similarity index 100% rename from paywalls/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/UIKitPaywall.kt rename to revenuecatui/src/iosMain/kotlin/com/revenuecat/purchases/kmp/ui/revenuecatui/UIKitPaywall.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 7fbbd3c1..0c4303f2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,5 +23,5 @@ include(":core") include(":result") include(":either") include(":datetime") -include(":paywalls") +include(":revenuecatui") include(":composeApp")