Skip to content

Commit

Permalink
Merge pull request #298 from wealthfront/compose
Browse files Browse the repository at this point in the history
Add compose libs to sample project
  • Loading branch information
cmathew committed Apr 22, 2024
2 parents c077916 + 9808b76 commit 4898734
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 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
}
12 changes: 11 additions & 1 deletion gradle/libs.versions.toml
Expand Up @@ -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"
Expand All @@ -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" }
Expand All @@ -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" }
Expand Down
8 changes: 8 additions & 0 deletions magellan-sample-migration/build.gradle
Expand Up @@ -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
Expand Down

0 comments on commit 4898734

Please sign in to comment.