ANDROID-13507. Remove BOM (again) (#273)

* ANDROID-XXX Remove. Compose (ka)BOM

* ANDROID-13507 Update. Adjust compose versions and reorder declarations by type

* ANDROID-13507 Update. Kotlin readme version

README.md

@@ -4,7 +4,7 @@
 [![Platform](https://img.shields.io/badge/Platform-Android-brightgreen)](https://github.com/Telefonica/mistica-android)
 [![Version](https://maven-badges.herokuapp.com/maven-central/com.telefonica/mistica/badge.png)](https://search.maven.org/artifact/com.telefonica/mistica)
 [![Support](https://img.shields.io/badge/Support-%3E%3D%20Android%205.0-brightgreen)](https://github.com/Telefonica/mistica-android)
-[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.7-blue.svg)](https://kotlinlang.org/docs/reference/whatsnew13.html)
+[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.8.20-blue.svg)](https://kotlinlang.org/docs/whatsnew1820.html)
 
 Mistica is a framework that contains reusable UI components and utilities.
 

build.gradle

@@ -1,12 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        // Remember to update "ui_tooling_preview_version" when updating "compose_bom_version"
-        // according to https://mvnrepository.com/artifact/androidx.compose/compose-bom/
-        // For more info see https://github.com/Telefonica/mistica-android/pull/230
-        compose_bom_version = "2023.01.00"
-        ui_tooling_preview_version = "1.3.3"
-        compose_version = '1.3.1'
+        compose_ui_version = "1.3.3"
+        compose_core_version = '1.3.1'
         compose_compiler_version = '1.4.7'
         kotlin_version = "1.8.21"
         androidx_appcompat_version = "1.5.1"

catalog/build.gradle

@@ -41,19 +41,21 @@ task sourceJar(type: Jar) {
 dependencies {
     implementation project(':library')
 
-    implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.constraintlayout:constraintlayout-compose:$constraintComposeVersion"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation "com.google.android.material:compose-theme-adapter:1.2.1"
     implementation "androidx.navigation:navigation-compose:2.5.3"
+    implementation "androidx.compose.material:material:$compose_core_version"
+    implementation "androidx.compose.ui:ui:$compose_ui_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
+
+    implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
+    implementation "com.google.android.material:compose-theme-adapter:1.2.1"
+
     implementation "io.coil-kt:coil-compose:$coil_version"
 
     testImplementation 'junit:junit:4.13'
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
 }
 
 apply from: "${rootProject.projectDir}/mavencentral.gradle"

library/build.gradle

@@ -63,32 +63,32 @@ dependencies {
     api 'androidx.constraintlayout:constraintlayout:2.0.4'
     api 'androidx.constraintlayout:constraintlayout-solver:2.0.4'
     api 'androidx.recyclerview:recyclerview:1.1.0'
-    def composeBom = platform("androidx.compose:compose-bom:$compose_bom_version")
-    api composeBom
+    api "androidx.compose.runtime:runtime:$compose_core_version"
 
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation "androidx.compose.ui:ui"
-    implementation "androidx.compose.material:material"
-    api "androidx.compose.runtime:runtime"
     implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation "androidx.constraintlayout:constraintlayout-compose:$constraintComposeVersion"
+
+    implementation "androidx.compose.material:material:$compose_core_version"
+    implementation "androidx.compose.ui:ui:$compose_ui_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
+
     implementation "com.google.android.material:compose-theme-adapter:1.1.5"
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
+
     implementation "io.coil-kt:coil-compose:$coil_version"
-    implementation "androidx.constraintlayout:constraintlayout-compose:$constraintComposeVersion"
-    implementation "androidx.compose.ui:ui-tooling-preview:$ui_tooling_preview_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.airbnb.android:lottie:3.2.2'
 
     implementation "com.github.skydoves:balloon-compose:1.5.3"
 
-    testImplementation composeBom
     testImplementation 'junit:junit:4.13.2'
-    testImplementation "androidx.compose.ui:ui-test-junit4"
+    testImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
 
-    debugImplementation "androidx.compose.ui:ui-tooling"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
 }
 
 apply from: "${rootProject.projectDir}/mavencentral.gradle"