diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8e26852..018a6ef 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -60,6 +60,8 @@ dependencies { implementation(libs.material) implementation(libs.androidx.activity.compose) + + implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.ui.tooling) implementation(libs.androidx.compose.material) diff --git a/cloudy/build.gradle.kts b/cloudy/build.gradle.kts index 55fb41f..fd8ee41 100644 --- a/cloudy/build.gradle.kts +++ b/cloudy/build.gradle.kts @@ -68,6 +68,7 @@ tasks.withType { } dependencies { + implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.material) implementation(libs.androidx.compose.runtime) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4cd7dea..5edfea4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -agp = "7.3.0" +agp = "7.3.1" kotlin = "1.7.20" javaRelease = "8" jvmTarget = "1.8" material = "1.6.1" androidxActivity = "1.4.0" -androidxCompose = "1.3.0" +androidxComposeBom = "2022.12.00" androidxComposeCompiler = "1.3.2" androidxComposeConstraintLayout = "1.0.0" androidxCore = "1.8.0" @@ -23,20 +23,18 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } dokka = { id = "org.jetbrains.dokka", version = "1.7.10" } nexusPlugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.1.0" } spotless = { id = "com.diffplug.spotless", version = "6.7.0" } -kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.11.0" } +kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.12.1" } [libraries] -agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } - -# For the demo project material = { module = "com.google.android.material:material", version.ref = "material" } -androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxCompose" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxCompose" } -androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidxCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-compose-material = { group = "androidx.compose.material", name = "material" } +androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } +androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxCompose" } -androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidxCompose" } androidx-compose-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidxComposeConstraintLayout" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" } @@ -46,7 +44,3 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = " androidx-test-junit = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxJunit" } androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } landscapist-glide = { group = "com.github.skydoves", name = "landscapist-glide", version.ref = "landscapist" } - -# Test libs -junit = { module = "junit:junit", version = "4.13.2" } -truth = { module = "com.google.truth:truth", version = "1.1.3" } \ No newline at end of file