Skip to content

Commit fcceae2

Browse files
committed
build: update to use compose BOM; update compose to 1.6.0
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 26fa9bd commit fcceae2

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,13 @@ dependencies {
132132
androidTestImplementation("io.mockk:mockk:1.13.5")
133133

134134
//Jetpack compose
135+
implementation(platform(Libs.compose_bom))
135136
implementation(Libs.compose_ui)
136137
debugImplementation(Libs.compose_ui_tools)
137138
implementation(Libs.compose_ui_tools_preview)
138139
implementation(Libs.compose_foundation)
139140
implementation(Libs.compose_material)
140-
implementation("androidx.activity:activity-compose:1.8.0")
141+
implementation(Libs.compose_activities)
141142
implementation(Libs.compose_view_models)
142143
implementation(Libs.compose_livedata)
143144
implementation(Libs.compose_navigation)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fun MarkdownText(
3232
modifier: Modifier = Modifier,
3333
color: Color = Color.Unspecified,
3434
fontSize: TextUnit = TextUnit.Unspecified,
35-
textAlign: TextAlign? = null,
35+
textAlign: TextAlign = TextAlign.Unspecified,
3636
maxLines: Int = Int.MAX_VALUE,
3737
@FontRes fontResource: Int? = null,
3838
style: TextStyle = LocalTextStyle.current,
@@ -75,7 +75,7 @@ private fun createTextView(
7575
color: Color = Color.Unspecified,
7676
defaultColor: Color,
7777
fontSize: TextUnit = TextUnit.Unspecified,
78-
textAlign: TextAlign? = null,
78+
textAlign: TextAlign = TextAlign.Unspecified,
7979
maxLines: Int = Int.MAX_VALUE,
8080
@FontRes fontResource: Int? = null,
8181
style: TextStyle,

buildSrc/src/main/java/Dependencies.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ object Versions {
2323
const val androidx_room = "2.6.1"
2424
const val sqlcipher = "4.5.1@aar"
2525

26-
const val compose = "1.5.4"
27-
const val compose_activities: String = "1.4.0"
26+
const val compose = "2024.01.00"
27+
const val compose_activities: String = "1.8.2"
2828
const val compose_view_models: String = "2.6.2"
2929
const val compose_navigation: String = "2.7.3"
3030

@@ -138,12 +138,13 @@ object Libs {
138138
"androidx.constraintlayout:constraintlayout-compose:1.0.1"
139139
//const val androidx_lifecycle_compose = androidx.lifecycle-viewmodel-compose:${Versions.androidx_lifecycle}"
140140

141-
const val compose_ui = "androidx.compose.ui:ui:1.5.3"
142-
const val compose_ui_tools = "androidx.compose.ui:ui-tooling:1.5.3"
141+
const val compose_bom = "androidx.compose:compose-bom:${Versions.compose}"
142+
const val compose_ui = "androidx.compose.ui:ui"
143+
const val compose_ui_tools = "androidx.compose.ui:ui-tooling"
143144
const val compose_ui_tools_preview =
144-
"androidx.compose.ui:ui-tooling-preview:1.5.3"
145-
const val compose_foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
146-
const val compose_material = "androidx.compose.material:material:${Versions.compose}"
145+
"androidx.compose.ui:ui-tooling-preview"
146+
const val compose_foundation = "androidx.compose.foundation:foundation"
147+
const val compose_material = "androidx.compose.material:material"
147148
const val compose_activities =
148149
"androidx.activity:activity-compose:${Versions.compose_activities}"
149150
const val compose_view_models =

0 commit comments

Comments
 (0)