Skip to content
This repository has been archived by the owner on Jul 28, 2024. It is now read-only.

Commit

Permalink
Kotlin 2.0.0 support and bump dependencies (#17)
Browse files Browse the repository at this point in the history
* Bumping dependencies and kotlin version 2.0.0
* Increase library version
  • Loading branch information
mirzemehdi authored Jun 6, 2024
1 parent 8280627 commit 2b96c8a
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ captures
!*.xcodeproj/project.xcworkspace/
!*.xcworkspace/contents.xcworkspacedata
**/xcshareddata/WorkspaceSettings.xcsettings
.kotlin
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# KMPRevenueCat - Kotlin Multiplatform RevenueCat Library
[![Build](https://github.com/mirzemehdi/KMPRevenueCat/actions/workflows/build_and_publish.yml/badge.svg)](https://github.com/mirzemehdi/KMPRevenueCat/actions/workflows/build_and_publish.yml)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.21-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/Kotlin-2.0.0-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
[![Maven Central](https://img.shields.io/maven-central/v/io.github.mirzemehdi/kmprevenuecat-purchases?color=blue)](https://search.maven.org/search?q=g:io.github.mirzemehdi+kmprevenuecat)

![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat)
Expand All @@ -19,8 +19,8 @@ Related Blog Post (if you want to integrate it yourself without this library): h
- **Android:** `minSdkVersion 24`
- **iOS:** `minDeploymentTarget 15.0`

- **RevenueCat Android version:** `7.9.0`
- **RevenueCat iOS version:** `4.41.1`
- **RevenueCat Android version:** `7.11.0`
- **RevenueCat iOS version:** `4.43.0`

### Gradle Setup
KMPRevenueCat is available on Maven Central. In your root project `build.gradle.kts` file (or `settings.gradle` file) add `mavenCentral()` to repositories.
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
// this is necessary to avoid the plugins to be loaded multiple times
// in each subproject's classloader
alias(libs.plugins.jetbrainsCompose) apply false
alias(libs.plugins.composeCompiler) apply false
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ kotlin.mpp.enableCInteropCommonization=true
#Development
development=true

kmpRevenueCatVersion=0.3.1
kmpRevenueCatVersion=1.0.0
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
[versions]
compose = "1.5.4"
compose-plugin = "1.6.1"
compose-compiler = "1.5.4"
agp = "8.1.3"
compose = "1.6.7"
compose-plugin = "1.6.10"
agp = "8.1.4"
android-minSdk = "24"
android-compileSdk = "34"
android-targetSdk = "34"
androidx-activityCompose = "1.8.0"
androidx-core-ktx = "1.12.0"
androidx-appcompat = "1.6.1"
androidx-material = "1.10.0"
androidx-activityCompose = "1.9.0"
androidx-core-ktx = "1.13.1"
androidx-appcompat = "1.7.0"
androidx-material = "1.12.0"
androidx-constraintlayout = "2.1.4"
androidx-test-junit = "1.1.5"
androidx-espresso-core = "3.5.1"
androidx-startup-runtime = "1.1.1"
kotlin = "1.9.23"
kotlin = "2.0.0"
junit = "4.13.2"
koin = "3.5.4"
koin = "3.5.6"
kotlinx-binary-validator = "0.13.2"
dokka = "1.9.20"
koinCompose = "1.1.0"
revenueCatAndroid="7.9.0"
revenueCatIos="4.41.1"
koinCompose = "1.1.5"
revenueCatAndroid="7.11.0"
revenueCatIos="4.43.0"



Expand Down Expand Up @@ -54,6 +53,7 @@ revenuecat-purchases-ui = { group = "com.revenuecat.purchases", name = "purchase

[plugins]
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
Expand Down
1 change: 1 addition & 0 deletions kmprevenuecat-purchases-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinNativeCocoaPods)
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.composeCompiler)
}

kotlin {
Expand Down
14 changes: 9 additions & 5 deletions kmprevenuecat-purchases-ui/kmprevenuecat_purchases_ui.podspec
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Pod::Spec.new do |spec|
spec.name = 'kmprevenuecat_purchases_ui'
spec.version = '0.3.1'
spec.version = '1.0.0'
spec.homepage = ''
spec.source = { :http=> ''}
spec.authors = ''
spec.license = ''
spec.summary = ''
spec.vendored_frameworks = 'build/cocoapods/framework/KMPRevenueCatPurchasesUI.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '15.0'
spec.dependency 'RevenueCat', '4.41.1'
spec.dependency 'RevenueCatUI', '4.41.1'
spec.ios.deployment_target = '15.0'
spec.dependency 'RevenueCat', '4.43.0'
spec.dependency 'RevenueCatUI', '4.43.0'

if !Dir.exist?('build/cocoapods/framework/KMPRevenueCatPurchasesUI.framework') || Dir.empty?('build/cocoapods/framework/KMPRevenueCatPurchasesUI.framework')
raise "
Expand All @@ -23,6 +23,10 @@ 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' => ':kmprevenuecat-purchases-ui',
'PRODUCT_MODULE_NAME' => 'KMPRevenueCatPurchasesUI',
Expand All @@ -47,5 +51,5 @@ Pod::Spec.new do |spec|
SCRIPT
}
]
spec.resources = ['build/compose/ios/KMPRevenueCatPurchasesUI/compose-resources']
spec.resources = ['build/compose/cocoapods/compose-resources']
end
10 changes: 7 additions & 3 deletions kmprevenuecat-purchases/kmprevenuecat_purchases.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Pod::Spec.new do |spec|
spec.name = 'kmprevenuecat_purchases'
spec.version = '0.3.1'
spec.version = '1.0.0'
spec.homepage = ''
spec.source = { :http=> ''}
spec.authors = ''
spec.license = ''
spec.summary = ''
spec.vendored_frameworks = 'build/cocoapods/framework/KMPRevenueCatPurchases.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '15.0'
spec.dependency 'RevenueCat', '4.41.1'
spec.ios.deployment_target = '15.0'
spec.dependency 'RevenueCat', '4.43.0'

if !Dir.exist?('build/cocoapods/framework/KMPRevenueCatPurchases.framework') || Dir.empty?('build/cocoapods/framework/KMPRevenueCatPurchases.framework')
raise "
Expand All @@ -22,6 +22,10 @@ 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' => ':kmprevenuecat-purchases',
'PRODUCT_MODULE_NAME' => 'KMPRevenueCatPurchases',
Expand Down
4 changes: 1 addition & 3 deletions sampleApp/composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.composeCompiler)
}

kotlin {
Expand Down Expand Up @@ -62,9 +63,6 @@ android {
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand Down
2 changes: 1 addition & 1 deletion sampleApp/iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
repositoryURL = "https://github.com/RevenueCat/purchases-ios";
requirement = {
kind = exactVersion;
version = 4.41.1;
version = 4.43.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/RevenueCat/purchases-ios",
"state" : {
"revision" : "9f46bb70940087ec9a95b1e9288710bb439549d8",
"version" : "4.41.1"
"revision" : "7ec1091a6f929c40be2a1c695a63471f5d0c330d",
"version" : "4.43.0"
}
},
{
Expand Down

0 comments on commit 2b96c8a

Please sign in to comment.