all: tweak dependency namespacing

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-06-06 16:37:09 +05:30
parent 4168fe3875
commit 23b2e635bb
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
4 changed files with 20 additions and 20 deletions

View file

@ -7,9 +7,10 @@ plugins {
dependencies { dependencies {
implementation(projects.api) implementation(projects.api)
implementation(projects.common) implementation(projects.common)
implementation("androidx.activity:activity-compose:1.3.0-beta01") implementation(libs.androidx.activity.compose)
implementation("androidx.appcompat:appcompat:1.4.0-alpha02") implementation(libs.androidx.appcompat)
implementation("androidx.paging:paging-compose:1.0.0-alpha10") implementation(libs.androidx.paging.compose)
implementation(libs.retrofit.moshiConverter)
} }
android { android {

View file

@ -6,10 +6,10 @@ plugins {
} }
dependencies { dependencies {
api(libs.thirdparty.retrofit.lib) api(libs.retrofit.lib)
ksp(libs.thirdparty.moshix.ksp) ksp(libs.moshix.ksp)
implementation(libs.thirdparty.moshi.lib) implementation(libs.moshi.lib)
implementation(libs.thirdparty.retrofit.moshiConverter) { exclude(group = "com.squareup.moshi") } implementation(libs.retrofit.moshiConverter) { exclude(group = "com.squareup.moshi") }
testImplementation(libs.kotlin.coroutines.core) testImplementation(libs.kotlin.coroutines.core)
testImplementation(libs.testing.kotlintest.junit) testImplementation(libs.testing.kotlintest.junit)
testImplementation(libs.testing.mockWebServer) testImplementation(libs.testing.mockWebServer)

View file

@ -27,13 +27,9 @@ kotlin {
val androidAndroidTestRelease by getting val androidAndroidTestRelease by getting
val commonMain by getting val commonMain by getting
val commonTest by getting val commonTest by getting
val androidMain by getting { val androidMain by getting { dependencies { implementation(libs.sqldelight.androidDriver) } }
dependencies { implementation(libs.thirdparty.sqldelight.androidDriver) }
}
val androidTest by getting { dependsOn(androidAndroidTestRelease) } val androidTest by getting { dependsOn(androidAndroidTestRelease) }
val desktopMain by getting { val desktopMain by getting { dependencies { implementation(libs.sqldelight.jvmDriver) } }
dependencies { implementation(libs.thirdparty.sqldelight.jvmDriver) }
}
val desktopTest by getting { val desktopTest by getting {
dependencies { dependencies {
implementation(libs.kotlin.coroutines.core) implementation(libs.kotlin.coroutines.core)

View file

@ -11,17 +11,20 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" } kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutines" }
androidx-activity-compose = "androidx.activity:activity-compose:1.3.0-beta01"
androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-alpha02"
androidx-browser = "androidx.browser:browser:1.3.0" androidx-browser = "androidx.browser:browser:1.3.0"
androidx-paging-compose = "androidx.paging:paging-compose:1.0.0-alpha10"
thirdparty-moshi-lib = "com.squareup.moshi:moshi:1.12.0" moshi-lib = "com.squareup.moshi:moshi:1.12.0"
thirdparty-moshix-ksp = { module = "dev.zacsweers.moshix:moshi-ksp", version.ref = "moshix" } moshix-ksp = { module = "dev.zacsweers.moshix:moshi-ksp", version.ref = "moshix" }
thirdparty-moshix-metadatareflect = { module = "dev.zacsweers.moshix:moshi-metadata-reflect", version.ref = "moshix" } moshix-metadatareflect = { module = "dev.zacsweers.moshix:moshi-metadata-reflect", version.ref = "moshix" }
thirdparty-retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
thirdparty-retrofit-moshiConverter = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" } retrofit-moshiConverter = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
thirdparty-sqldelight-jvmDriver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" } sqldelight-jvmDriver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
thirdparty-sqldelight-androidDriver = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-androidDriver = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2" testing-mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2"