diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index a53d4956..0eddaac1 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -1,5 +1,5 @@ object Versions { - const val compileSdkVersion = 30 + const val compileSdkVersion = 34 const val minSdkVersion = 21 const val targetSdkVersion = 30 } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 86b2642d..3e69e4b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ javainject = "1" material = "1.4.0" recyclerView = "1.2.1" coroutines = "1.6.4" +compose-bom = "2024.04.01" testCore = "1.4.0" junit = "4.13.2" @@ -38,7 +39,6 @@ espresso = "3.4.0" lint = "30.0.2" - [libraries] appCompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "supportLib" } constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" } @@ -63,6 +63,16 @@ coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core" coroutinesAndroid = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } coroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } +compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } +compose-ui = { group = "androidx.compose.ui", name = "ui" } +compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +compose-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +compose-material = { group = "androidx.compose.material", name = "material" } +compose-material3 = { group = "androidx.compose.material3", name = "material3" } +compose-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +compose-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } + glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" } retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofitMock = { group = "com.squareup.retrofit2", name = "retrofit-mock", version.ref = "retrofit" } diff --git a/magellan-sample-migration/build.gradle b/magellan-sample-migration/build.gradle index 24b60876..ded2af3d 100644 --- a/magellan-sample-migration/build.gradle +++ b/magellan-sample-migration/build.gradle @@ -66,6 +66,14 @@ dependencies { implementation libs.jodaTime implementation libs.recyclerView + implementation(enforcedPlatform(libs.compose.bom)) + implementation libs.compose.foundation + implementation libs.compose.ui + implementation libs.compose.tooling + implementation libs.compose.tooling.preview + implementation libs.compose.material + implementation libs.compose.material3 + kaptTest libs.daggerCompiler testImplementation libs.junit testImplementation libs.testCore