Skip to content

Commit

Permalink
Remove BOM (#41)
Browse files Browse the repository at this point in the history
* Remove BOM

* remove unneeded noinspection
  • Loading branch information
yamal-alm authored Apr 26, 2024
1 parent 3a49297 commit e1f4c1f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
12 changes: 5 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'

implementation platform("androidx.compose:compose-bom:$compose_bom_version")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.activity:activity-compose:1.9.0'

Expand All @@ -72,7 +71,6 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation platform("androidx.compose:compose-bom:$compose_bom_version")
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
debugImplementation "androidx.compose.ui:ui-tooling"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
}
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
buildscript {
ext {
compose_compiler_version = '1.5.12'
compose_bom_version = '2024.04.01'
compose_version = '1.6.6'

kotlin_version = '1.9.23'
dagger_version = "2.51.1"
}
Expand Down
10 changes: 4 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,13 @@ dependencies {
enabledImplementation 'androidx.appcompat:appcompat:1.6.1'
enabledImplementation 'com.google.android.material:material:1.11.0'

enabledImplementation platform("androidx.compose:compose-bom:$compose_bom_version")
enabledImplementation "androidx.compose.material:material"
enabledImplementation "androidx.compose.ui:ui-tooling-preview"
enabledImplementation "androidx.compose.material:material:$compose_version"
enabledImplementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
enabledImplementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
enabledImplementation 'androidx.activity:activity-compose:1.9.0'
enabledImplementation 'com.squareup:seismic:1.0.3'
enabledImplementation "androidx.datastore:datastore-preferences:1.1.0"
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.navigation:navigation-compose:2.7.7"

//Dagger
Expand All @@ -76,11 +75,10 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito.kotlin:mockito-kotlin:5.2.1"

androidTestImplementation platform("androidx.compose:compose-bom:$compose_bom_version")
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
}

apply from: "${rootProject.projectDir}/mavencentral.gradle"

0 comments on commit e1f4c1f

Please sign in to comment.