From 03b2bbd22c59828598a5eef95625145decd243f7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 8 Nov 2020 15:44:05 +0530 Subject: [PATCH 01/11] app: sort dependencies Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6621c1d7..56cafbd4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -61,41 +61,41 @@ android { dependencies { - kapt(Dependencies.ThirdParty.Roomigrant.compiler) kapt(Dependencies.AndroidX.Hilt.daggerCompiler) kapt(Dependencies.AndroidX.Hilt.daggerHiltCompiler) kapt(Dependencies.AndroidX.Room.compiler) + kapt(Dependencies.ThirdParty.Roomigrant.compiler) implementation(project(":lobsters-api")) implementation(project(":model")) - implementation(Dependencies.AndroidX.coreKtx) implementation(Dependencies.AndroidX.activityKtx) implementation(Dependencies.AndroidX.appCompat) implementation(Dependencies.AndroidX.browser) + implementation(Dependencies.AndroidX.coreKtx) + implementation(Dependencies.AndroidX.material) + implementation(Dependencies.AndroidX.Compose.compiler) implementation(Dependencies.AndroidX.Compose.foundation) implementation(Dependencies.AndroidX.Compose.foundationLayout) implementation(Dependencies.AndroidX.Compose.foundationText) - implementation(Dependencies.AndroidX.Compose.runtime) implementation(Dependencies.AndroidX.Compose.material) - implementation(Dependencies.AndroidX.Compose.compiler) + implementation(Dependencies.AndroidX.Compose.navigation) + implementation(Dependencies.AndroidX.Compose.runtime) implementation(Dependencies.AndroidX.Compose.ui) implementation(Dependencies.AndroidX.Compose.uiTooling) implementation(Dependencies.AndroidX.Compose.uiText) implementation(Dependencies.AndroidX.Compose.uiTextAndroid) implementation(Dependencies.AndroidX.Compose.uiUnit) + implementation(Dependencies.AndroidX.Hilt.dagger) implementation(Dependencies.AndroidX.Hilt.hiltLifecycleViewmodel) implementation(Dependencies.AndroidX.Lifecycle.runtimeKtx) implementation(Dependencies.AndroidX.Lifecycle.viewmodelKtx) - implementation(Dependencies.AndroidX.Compose.navigation) implementation(Dependencies.AndroidX.Room.runtime) implementation(Dependencies.AndroidX.Room.ktx) - implementation(Dependencies.ThirdParty.Roomigrant.runtime) - implementation(Dependencies.AndroidX.material) - implementation(Dependencies.AndroidX.Hilt.dagger) - implementation(Dependencies.ThirdParty.accompanist) implementation(Dependencies.Kotlin.Coroutines.android) implementation(Dependencies.Kotlin.Serialization.json) + implementation(Dependencies.ThirdParty.accompanist) implementation(Dependencies.ThirdParty.customtabs) - androidTestImplementation(Dependencies.Testing.daggerHilt) + implementation(Dependencies.ThirdParty.Roomigrant.runtime) testImplementation(Dependencies.Testing.junit) + androidTestImplementation(Dependencies.Testing.daggerHilt) androidTestImplementation(Dependencies.Testing.uiTest) } From dd177c5578c8a35f395b7ab1f49a24e9ca9bdbab Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 8 Nov 2020 15:53:46 +0530 Subject: [PATCH 02/11] buildSrc: add Ktor dependencies Signed-off-by: Harsh Shandilya --- buildSrc/src/main/java/Dependencies.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index baeb360e..99e5000c 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -17,6 +17,15 @@ object Dependencies { const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" } + object Ktor { + + private const val version = "1.4.0" + const val clientCore = "io.ktor:ktor-client-core:$version" + const val clientJson = "io.ktor:ktor-client-json:$version" + const val clientSerialization = "io.ktor:ktor-client-serialization:$version" + const val clientOkHttp = "io.ktor:ktor-client-okhttp:$version" + } + object Serialization { private const val version = "1.0.1" From bc7eb9abaad01196c58621aee02d5a665228e1d3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 8 Nov 2020 16:00:07 +0530 Subject: [PATCH 03/11] idea: don't wildcard ktor imports Signed-off-by: Harsh Shandilya --- .idea/codeStyles/Project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 2cbc39d5..d6efc561 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -6,7 +6,7 @@ - +