Skip to content

Commit 1e97476

Browse files
JayShortwayJayShortway
authored
Adjusts the package name of generated Kotlin bindings (#668)
1 parent 1324190 commit 1e97476

38 files changed

+166
-162
lines changed

‎core/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ kotlin {
4545
pod("PurchasesHybridCommon") {
4646
version = libs.versions.revenuecat.common.get()
4747
extraOpts += listOf("-compiler-option", "-fmodules")
48+
packageName = "swiftPMImport.com.revenuecat.purchases.kn.core"
4849
}
4950
}
5051
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.revenuecat.purchases.kmp
22

3-
import cocoapods.PurchasesHybridCommon.IOSAPIAvailabilityChecker
4-
import cocoapods.PurchasesHybridCommon.RCCommonFunctionality
5-
import cocoapods.PurchasesHybridCommon.trackAdDisplayed
6-
import cocoapods.PurchasesHybridCommon.trackAdFailedToLoad
7-
import cocoapods.PurchasesHybridCommon.trackAdLoaded
8-
import cocoapods.PurchasesHybridCommon.trackAdOpened
9-
import cocoapods.PurchasesHybridCommon.trackAdRevenue
3+
import swiftPMImport.com.revenuecat.purchases.kn.core.IOSAPIAvailabilityChecker
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCommonFunctionality
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.trackAdDisplayed
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.trackAdFailedToLoad
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.trackAdLoaded
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.trackAdOpened
9+
import swiftPMImport.com.revenuecat.purchases.kn.core.trackAdRevenue
1010
import com.revenuecat.purchases.kmp.models.AdDisplayedData
1111
import com.revenuecat.purchases.kmp.models.AdFailedToLoadData
1212
import com.revenuecat.purchases.kmp.models.AdLoadedData

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.revenuecat.purchases.kmp
22

3-
import cocoapods.PurchasesHybridCommon.RCLogLevel
4-
import cocoapods.PurchasesHybridCommon.RCLogLevelDebug
5-
import cocoapods.PurchasesHybridCommon.RCLogLevelError
6-
import cocoapods.PurchasesHybridCommon.RCLogLevelInfo
7-
import cocoapods.PurchasesHybridCommon.RCLogLevelVerbose
8-
import cocoapods.PurchasesHybridCommon.RCLogLevelWarn
3+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevel
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelDebug
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelError
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelInfo
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelVerbose
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelWarn
99

1010
private typealias IosLogHandler = (RCLogLevel, String?) -> Unit
1111

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.revenuecat.purchases.kmp
22

3-
import cocoapods.PurchasesHybridCommon.RCLogLevelDebug
4-
import cocoapods.PurchasesHybridCommon.RCLogLevelError
5-
import cocoapods.PurchasesHybridCommon.RCLogLevelInfo
6-
import cocoapods.PurchasesHybridCommon.RCLogLevelVerbose
7-
import cocoapods.PurchasesHybridCommon.RCLogLevelWarn
8-
import cocoapods.PurchasesHybridCommon.RCLogLevel as IosLogLevel
3+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelDebug
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelError
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelInfo
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelVerbose
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevelWarn
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCLogLevel as IosLogLevel
99

1010
internal fun IosLogLevel.toLogLevel(): LogLevel =
1111
when (this) {

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package com.revenuecat.purchases.kmp
22

3-
import cocoapods.PurchasesHybridCommon.IOSAPIAvailabilityChecker
4-
import cocoapods.PurchasesHybridCommon.RCCommonFunctionality
5-
import cocoapods.PurchasesHybridCommon.RCCustomerInfo
6-
import cocoapods.PurchasesHybridCommon.RCIntroEligibility
7-
import cocoapods.PurchasesHybridCommon.RCPurchaseParamsBuilder
8-
import cocoapods.PurchasesHybridCommon.RCPurchasesDelegateProtocol
9-
import cocoapods.PurchasesHybridCommon.RCStoreProduct
10-
import cocoapods.PurchasesHybridCommon.RCStoreTransaction
11-
import cocoapods.PurchasesHybridCommon.RCVirtualCurrencies
12-
import cocoapods.PurchasesHybridCommon.configureWithAPIKey
13-
import cocoapods.PurchasesHybridCommon.isWebPurchaseRedemptionURL
14-
import cocoapods.PurchasesHybridCommon.parseAsWebPurchaseRedemptionWithUrlString
15-
import cocoapods.PurchasesHybridCommon.recordPurchaseForProductID
16-
import cocoapods.PurchasesHybridCommon.setAirbridgeDeviceID
17-
import cocoapods.PurchasesHybridCommon.setAirshipChannelID
18-
import cocoapods.PurchasesHybridCommon.setOnesignalUserID
19-
import cocoapods.PurchasesHybridCommon.showStoreMessagesForTypes
3+
import swiftPMImport.com.revenuecat.purchases.kn.core.IOSAPIAvailabilityChecker
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCommonFunctionality
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCustomerInfo
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCIntroEligibility
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPurchaseParamsBuilder
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPurchasesDelegateProtocol
9+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCStoreProduct
10+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCStoreTransaction
11+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCVirtualCurrencies
12+
import swiftPMImport.com.revenuecat.purchases.kn.core.configureWithAPIKey
13+
import swiftPMImport.com.revenuecat.purchases.kn.core.isWebPurchaseRedemptionURL
14+
import swiftPMImport.com.revenuecat.purchases.kn.core.parseAsWebPurchaseRedemptionWithUrlString
15+
import swiftPMImport.com.revenuecat.purchases.kn.core.recordPurchaseForProductID
16+
import swiftPMImport.com.revenuecat.purchases.kn.core.setAirbridgeDeviceID
17+
import swiftPMImport.com.revenuecat.purchases.kn.core.setAirshipChannelID
18+
import swiftPMImport.com.revenuecat.purchases.kn.core.setOnesignalUserID
19+
import swiftPMImport.com.revenuecat.purchases.kn.core.showStoreMessagesForTypes
2020
import com.revenuecat.purchases.kmp.ktx.mapEntriesNotNull
2121
import com.revenuecat.purchases.kmp.mappings.buildStoreTransaction
2222
import com.revenuecat.purchases.kmp.mappings.toCustomerInfo
@@ -67,9 +67,9 @@ import com.revenuecat.purchases.kmp.models.WinBackOffer
6767
import com.revenuecat.purchases.kmp.strings.ConfigureStrings
6868
import platform.Foundation.NSError
6969
import platform.Foundation.NSURL
70-
import cocoapods.PurchasesHybridCommon.RCDangerousSettings as IosDangerousSettings
71-
import cocoapods.PurchasesHybridCommon.RCPurchases as IosPurchases
72-
import cocoapods.PurchasesHybridCommon.RCWinBackOffer as NativeIosWinBackOffer
70+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCDangerousSettings as IosDangerousSettings
71+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPurchases as IosPurchases
72+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCWinBackOffer as NativeIosWinBackOffer
7373

7474
public actual class Purchases private constructor(private val iosPurchases: IosPurchases) {
7575
public actual companion object {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.revenuecat.purchases.kmp
22

3-
import cocoapods.PurchasesHybridCommon.RCCustomerInfo
4-
import cocoapods.PurchasesHybridCommon.RCPurchases
5-
import cocoapods.PurchasesHybridCommon.RCPurchasesDelegateProtocol
6-
import cocoapods.PurchasesHybridCommon.RCStoreProduct
7-
import cocoapods.PurchasesHybridCommon.RCStoreTransaction
3+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCustomerInfo
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPurchases
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPurchasesDelegateProtocol
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCStoreProduct
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCStoreTransaction
88
import com.revenuecat.purchases.kmp.mappings.toCustomerInfo
99
import com.revenuecat.purchases.kmp.mappings.toPurchasesErrorOrThrow
1010
import com.revenuecat.purchases.kmp.mappings.toStoreProduct

‎mappings/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ kotlin {
2727
pod("PurchasesHybridCommon") {
2828
version = libs.versions.revenuecat.common.get()
2929
extraOpts += listOf("-compiler-option", "-fmodules")
30+
packageName = "swiftPMImport.com.revenuecat.purchases.kn.core"
3031
}
3132
}
3233
}

‎mappings/src/iosMain/kotlin/com/revenuecat/purchases/kmp/mappings/CacheFetchPolicy.ios.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.revenuecat.purchases.kmp.mappings
22

3-
import cocoapods.PurchasesHybridCommon.RCCacheFetchPolicyCachedOrFetched
4-
import cocoapods.PurchasesHybridCommon.RCCacheFetchPolicyFetchCurrent
5-
import cocoapods.PurchasesHybridCommon.RCCacheFetchPolicyFromCacheOnly
6-
import cocoapods.PurchasesHybridCommon.RCCacheFetchPolicyNotStaleCachedOrFetched
73
import com.revenuecat.purchases.kmp.models.CacheFetchPolicy
8-
import cocoapods.PurchasesHybridCommon.RCCacheFetchPolicy as IosCacheFetchPolicy
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCacheFetchPolicyCachedOrFetched
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCacheFetchPolicyFetchCurrent
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCacheFetchPolicyFromCacheOnly
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCacheFetchPolicyNotStaleCachedOrFetched
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCacheFetchPolicy as IosCacheFetchPolicy
99

1010
public fun CacheFetchPolicy.toIosCacheFetchPolicy(): IosCacheFetchPolicy =
1111
when (this) {

‎mappings/src/iosMain/kotlin/com/revenuecat/purchases/kmp/mappings/CustomerInfo.ios.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.revenuecat.purchases.kmp.mappings.ktx.toEpochMilliseconds
55
import com.revenuecat.purchases.kmp.models.CustomerInfo
66
import platform.Foundation.dictionaryWithValuesForKeys
77
import platform.darwin.NSObject
8-
import cocoapods.PurchasesHybridCommon.RCCustomerInfo as IosCustomerInfo
8+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCCustomerInfo as IosCustomerInfo
99

1010
public fun IosCustomerInfo.toCustomerInfo(): CustomerInfo {
1111
@Suppress("UNCHECKED_CAST")

‎mappings/src/iosMain/kotlin/com/revenuecat/purchases/kmp/mappings/DiscountPaymentMode.ios.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.revenuecat.purchases.kmp.mappings
22

3-
import cocoapods.PurchasesHybridCommon.RCPaymentModeFreeTrial
4-
import cocoapods.PurchasesHybridCommon.RCPaymentModePayAsYouGo
5-
import cocoapods.PurchasesHybridCommon.RCPaymentModePayUpFront
63
import com.revenuecat.purchases.kmp.models.DiscountPaymentMode
7-
import cocoapods.PurchasesHybridCommon.RCPaymentMode as IosDiscountPaymentMode
4+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPaymentModeFreeTrial
5+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPaymentModePayAsYouGo
6+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPaymentModePayUpFront
7+
import swiftPMImport.com.revenuecat.purchases.kn.core.RCPaymentMode as IosDiscountPaymentMode
88

99
internal fun IosDiscountPaymentMode.toDiscountPaymentMode(): DiscountPaymentMode =
1010
when (this) {

0 commit comments

Comments
 (0)