From 107ae5e3d0fdb249a7874c3513f28825d223cc38 Mon Sep 17 00:00:00 2001 From: yamal Date: Thu, 25 Apr 2024 13:59:25 +0200 Subject: [PATCH 1/2] Remove BOM --- app/build.gradle | 14 +++++++------- build.gradle | 3 ++- library/build.gradle | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fce262..234ab6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,10 +60,10 @@ 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" + //noinspection BomWithoutPlatform + 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' @@ -72,7 +72,7 @@ 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" + //noinspection BomWithoutPlatform + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index db97c67..532b45b 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/library/build.gradle b/library/build.gradle index 4040e8b..660e241 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -57,14 +57,14 @@ 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" + //noinspection BomWithoutPlatform + 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 @@ -76,11 +76,11 @@ 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") + //noinspection BomWithoutPlatform 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" \ No newline at end of file From 886a08dad8981b61e2ca8cbaf7ac8c0b733c56f6 Mon Sep 17 00:00:00 2001 From: yamal Date: Thu, 25 Apr 2024 15:54:14 +0200 Subject: [PATCH 2/2] remove unneeded noinspection --- app/build.gradle | 2 -- library/build.gradle | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 234ab6a..546792b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' - //noinspection BomWithoutPlatform implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" @@ -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' - //noinspection BomWithoutPlatform androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" } \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 660e241..b9d503b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -57,7 +57,6 @@ dependencies { enabledImplementation 'androidx.appcompat:appcompat:1.6.1' enabledImplementation 'com.google.android.material:material:1.11.0' - //noinspection BomWithoutPlatform 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' @@ -76,7 +75,6 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation "org.mockito.kotlin:mockito-kotlin:5.2.1" - //noinspection BomWithoutPlatform androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation "androidx.compose.ui:ui-test-junit4"