Consolidates Compose versions (#112)

RevenueCat · Jun 26, 2024 · c29cc31 · c29cc31
1 parent b19cb42
commit c29cc31
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
-
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.application)
@@ -39,16 +37,15 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.ui)
-            @OptIn(ExperimentalComposeLibrary::class)
             implementation(compose.components.resources)
+            implementation(compose.components.uiToolingPreview)
             implementation(projects.core)
             implementation(projects.result)
             implementation(projects.either)
             implementation(projects.datetime)
             implementation(projects.revenuecatui)
         }
         androidMain.dependencies {
-            implementation(libs.androidx.compose.ui.tooling.preview)
             implementation(libs.androidx.activity.compose)
         }
     }
@@ -83,7 +80,4 @@ android {
         sourceCompatibility(libs.versions.java.get())
         targetCompatibility(libs.versions.java.get())
     }
-    dependencies {
-        debugImplementation(libs.androidx.compose.ui.tooling)
-    }
 }
diff --git a/composeApp/src/androidMain/kotlin/com/revenuecat/purchases/kmp/sample/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/revenuecat/purchases/kmp/sample/MainActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ agp = "8.4.1"
 android-compileSdk = "34"
 android-minSdk = "21"
 android-targetSdk = "34"
-compose = "1.6.7"
 java = "1.8"
 kotlin = "1.9.23"
 revenuecat-common = "10.10.0"
@@ -12,8 +11,6 @@ revenuecat-kmp = "0.5.0-SNAPSHOT"
 [libraries]
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.0" }
-androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.1.1" }
 arrow-core = { module = "io.arrow-kt:arrow-core", version = "1.2.4" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

diff --git a/revenuecatui/build.gradle.kts b/revenuecatui/build.gradle.kts
@@ -11,9 +11,9 @@ kotlin {
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.ui)
+            implementation(compose.components.uiToolingPreview)
         }
         androidMain.dependencies {
-            implementation(libs.androidx.compose.ui.tooling.preview)
             implementation(libs.revenuecat.commonUi)
         }
     }
@@ -44,7 +44,4 @@ android {
             isMinifyEnabled = false
         }
     }
-    dependencies {
-        debugImplementation(libs.androidx.compose.ui.tooling)
-    }
 }