Merge pull request #92 from code-payments/build/update-compose-2024.01.00

build: update to use compose BOM; update compose to 1.6.0

Author: bmc08gt

app/build.gradle.kts

@@ -132,12 +132,13 @@ dependencies {
     androidTestImplementation("io.mockk:mockk:1.13.5")
 
     //Jetpack compose
+    implementation(platform(Libs.compose_bom))
     implementation(Libs.compose_ui)
     debugImplementation(Libs.compose_ui_tools)
     implementation(Libs.compose_ui_tools_preview)
     implementation(Libs.compose_foundation)
     implementation(Libs.compose_material)
-    implementation("androidx.activity:activity-compose:1.8.0")
+    implementation(Libs.compose_activities)
     implementation(Libs.compose_view_models)
     implementation(Libs.compose_livedata)
     implementation(Libs.compose_navigation)

app/src/main/java/com/getcode/view/components/MarkdownText.kt

@@ -32,7 +32,7 @@ fun MarkdownText(
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
     fontSize: TextUnit = TextUnit.Unspecified,
-    textAlign: TextAlign? = null,
+    textAlign: TextAlign = TextAlign.Unspecified,
     maxLines: Int = Int.MAX_VALUE,
     @FontRes fontResource: Int? = null,
     style: TextStyle = LocalTextStyle.current,
@@ -75,7 +75,7 @@ private fun createTextView(
     color: Color = Color.Unspecified,
     defaultColor: Color,
     fontSize: TextUnit = TextUnit.Unspecified,
-    textAlign: TextAlign? = null,
+    textAlign: TextAlign = TextAlign.Unspecified,
     maxLines: Int = Int.MAX_VALUE,
     @FontRes fontResource: Int? = null,
     style: TextStyle,

buildSrc/src/main/java/Dependencies.kt

@@ -23,8 +23,8 @@ object Versions {
     const val androidx_room = "2.6.1"
     const val sqlcipher = "4.5.1@aar"
 
-    const val compose = "1.5.4"
-    const val compose_activities: String = "1.4.0"
+    const val compose = "2024.01.00"
+    const val compose_activities: String = "1.8.2"
     const val compose_view_models: String = "2.6.2"
     const val compose_navigation: String = "2.7.3"
 
@@ -138,12 +138,13 @@ object Libs {
         "androidx.constraintlayout:constraintlayout-compose:1.0.1"
     //const val androidx_lifecycle_compose = androidx.lifecycle-viewmodel-compose:${Versions.androidx_lifecycle}"
 
-    const val compose_ui = "androidx.compose.ui:ui:1.5.3"
-    const val compose_ui_tools = "androidx.compose.ui:ui-tooling:1.5.3"
+    const val compose_bom = "androidx.compose:compose-bom:${Versions.compose}"
+    const val compose_ui = "androidx.compose.ui:ui"
+    const val compose_ui_tools = "androidx.compose.ui:ui-tooling"
     const val compose_ui_tools_preview =
-        "androidx.compose.ui:ui-tooling-preview:1.5.3"
-    const val compose_foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
-    const val compose_material = "androidx.compose.material:material:${Versions.compose}"
+        "androidx.compose.ui:ui-tooling-preview"
+    const val compose_foundation = "androidx.compose.foundation:foundation"
+    const val compose_material = "androidx.compose.material:material"
     const val compose_activities =
         "androidx.activity:activity-compose:${Versions.compose_activities}"
     const val compose_view_models =