Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Fall back to Moshi KSP #217

Merged
merged 8 commits into from
Sep 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion biz/detail/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.moshiX)
alias(libs.plugins.ksp)
}

android {
Expand All @@ -17,4 +17,5 @@ dependencies {
implementation(libs.bundles.accompanist)

implementation(libs.square.moshi)
ksp(libs.square.moshi.compiler)
}
2 changes: 1 addition & 1 deletion biz/main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ plugins {
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.ksp)
alias(libs.plugins.moshiX)
}

android {
Expand All @@ -25,4 +24,5 @@ dependencies {
ksp(libs.androidX.room.compiler)

implementation(libs.square.moshi)
ksp(libs.square.moshi.compiler)
}
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ plugins {
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kotlinter) apply false
alias(libs.plugins.detekt) apply false
alias(libs.plugins.moshiX) apply false
}

allprojects {
Expand Down
4 changes: 3 additions & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ plugins {
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.ksp)
alias(libs.plugins.moshiX)
}

android {
Expand Down Expand Up @@ -35,7 +34,10 @@ dependencies {
ksp(libs.androidX.room.compiler)

implementation(libs.bundles.coil)

implementation(libs.square.moshi)
ksp(libs.square.moshi.compiler)

implementation(libs.square.retrofit.moshi)

debugImplementation(libs.chucker.debug)
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ glide = "4.13.2"
kotlin = "1.7.10"
square-okHttp = "4.10.0"
square-retrofit = "2.9.0"
square-moshi = "1.14.0"
srl = "2.0.5"
support = "28.0.0"

Expand All @@ -28,7 +29,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
ksp = "com.google.devtools.ksp:1.7.10-1.0.6"
moshiX = "dev.zacsweers.moshix:0.18.3"
kotlinter = "org.jmailen.kotlinter:3.12.0"
detekt = "io.gitlab.arturbosch.detekt:1.21.0"

Expand Down Expand Up @@ -67,7 +67,8 @@ androidX-viewPager2 = "androidx.viewpager2:viewpager2:1.0.0"
androidX-webKit = "androidx.webkit:webkit:1.5.0"

square-leakCanary = "com.squareup.leakcanary:leakcanary-android:2.9.1"
square-moshi = "com.squareup.moshi:moshi:1.14.0"
square-moshi = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" }
square-moshi-compiler = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "square-moshi" }
square-okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "square-okHttp" }
square-okHttp-LogInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "square-okHttp" }
square-okHttp-mock = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "square-okHttp" }
Expand Down