From 42f2b25f5c4b7774bb395001690611daa921ec2a Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Sun, 14 Mar 2021 22:42:50 +0530 Subject: [PATCH] build: use org.jetbrains.compose artifacts Signed-off-by: Aditya Wasan --- app/build.gradle.kts | 13 ++++--------- common/build.gradle.kts | 6 +++--- .../lobsters/ui/urllauncher/LocalUrlLauncher.kt | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7bbc99bf..9519f0ee 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,20 +27,16 @@ dependencies { implementation(project(":api")) implementation(project(":common")) implementation(project(":database")) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.runtime) + implementation(compose.ui) implementation(Dependencies.AndroidX.appCompat) implementation(Dependencies.AndroidX.browser) implementation(Dependencies.AndroidX.Compose.activity) - implementation(Dependencies.AndroidX.Compose.compiler) - implementation(Dependencies.AndroidX.Compose.foundation) - implementation(Dependencies.AndroidX.Compose.foundationLayout) implementation(Dependencies.AndroidX.Compose.lifecycleViewModel) - implementation(Dependencies.AndroidX.Compose.material) implementation(Dependencies.AndroidX.Compose.navigation) implementation(Dependencies.AndroidX.Compose.paging) - implementation(Dependencies.AndroidX.Compose.runtime) - implementation(Dependencies.AndroidX.Compose.ui) - implementation(Dependencies.AndroidX.Compose.uiTooling) - implementation(Dependencies.AndroidX.Compose.uiUnit) implementation(Dependencies.AndroidX.Hilt.dagger) implementation(Dependencies.AndroidX.Lifecycle.runtimeKtx) implementation(Dependencies.AndroidX.Lifecycle.viewmodelKtx) @@ -54,5 +50,4 @@ dependencies { testImplementation(Dependencies.Testing.junit) androidTestImplementation(Dependencies.AndroidX.Compose.activity) androidTestImplementation(Dependencies.Testing.daggerHilt) - androidTestImplementation(Dependencies.Testing.AndroidX.Compose.uiTestJunit4) } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 39b86f1e..469f1d9f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -38,20 +38,20 @@ kotlin { sourceSets { val androidMain by getting { dependencies { - implementation(Dependencies.AndroidX.Compose.runtime) + implementation(compose.runtime) implementation(Dependencies.AndroidX.browser) } } val commonMain by getting { dependencies { - implementation(Dependencies.AndroidX.Compose.runtime) + implementation(compose.runtime) } } val jvmMain by getting { dependencies { - implementation(Dependencies.AndroidX.Compose.runtime) + implementation(compose.runtime) } } } diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/ui/urllauncher/LocalUrlLauncher.kt b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/ui/urllauncher/LocalUrlLauncher.kt index 3d4ae1ed..41a9a1e1 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/ui/urllauncher/LocalUrlLauncher.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/lobsters/ui/urllauncher/LocalUrlLauncher.kt @@ -2,4 +2,4 @@ package dev.msfjarvis.lobsters.ui.urllauncher import androidx.compose.runtime.staticCompositionLocalOf -val LocalUrlLauncher = staticCompositionLocalOf { error("Needs to be provided") } \ No newline at end of file +val LocalUrlLauncher = staticCompositionLocalOf { error("Needs to be provided") }