Skip to content

Commit 5142d91

Browse files
committed
Switch to codegen on moshi
1 parent feaa42c commit 5142d91

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

ad-blocking/ad-blocking-impl/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies {
3939
implementation AndroidX.work.runtimeKtx
4040
implementation AndroidX.room.runtime
4141
ksp AndroidX.room.compiler
42+
ksp "com.squareup.moshi:moshi-kotlin-codegen:_"
4243
ksp project(':anvil-ksp')
4344
implementation project(path: ':anvil-annotations')
4445

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/di/AdBlockingExtensionModule.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.duckduckgo.di.scopes.AppScope
2727
import com.squareup.anvil.annotations.ContributesTo
2828
import com.squareup.moshi.JsonAdapter
2929
import com.squareup.moshi.Moshi
30-
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
3130
import dagger.Module
3231
import dagger.Provides
3332
import dagger.SingleInstanceIn
@@ -56,16 +55,10 @@ object AdBlockingExtensionModule {
5655
@SingleInstanceIn(AppScope::class)
5756
@Provides
5857
fun provideAdBlockingExtensionSettingsAdapter(): JsonAdapter<AdBlockingExtensionSettings> =
59-
Moshi.Builder()
60-
.add(KotlinJsonAdapterFactory())
61-
.build()
62-
.adapter(AdBlockingExtensionSettings::class.java)
58+
Moshi.Builder().build().adapter(AdBlockingExtensionSettings::class.java)
6359

6460
@SingleInstanceIn(AppScope::class)
6561
@Provides
6662
fun provideScriptletsSettingsAdapter(): JsonAdapter<ScriptletsSettings> =
67-
Moshi.Builder()
68-
.add(KotlinJsonAdapterFactory())
69-
.build()
70-
.adapter(ScriptletsSettings::class.java)
63+
Moshi.Builder().build().adapter(ScriptletsSettings::class.java)
7164
}

ad-blocking/ad-blocking-impl/src/main/java/com/duckduckgo/adblocking/impl/remoteconfig/AdBlockingExtensionConfigProvider.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
2121
import com.squareup.anvil.annotations.ContributesBinding
2222
import com.squareup.anvil.annotations.ContributesMultibinding
2323
import com.squareup.moshi.JsonAdapter
24+
import com.squareup.moshi.JsonClass
2425
import dagger.SingleInstanceIn
2526
import kotlinx.coroutines.flow.MutableStateFlow
2627
import kotlinx.coroutines.flow.StateFlow
@@ -30,16 +31,19 @@ import logcat.asLog
3031
import logcat.logcat
3132
import javax.inject.Inject
3233

34+
@JsonClass(generateAdapter = true)
3335
data class AdBlockingExtensionSettings(
3436
val version: String,
3537
val scriptlets: Map<String, ScriptletEntry>,
3638
)
3739

40+
@JsonClass(generateAdapter = true)
3841
data class ScriptletEntry(
3942
val url: String,
4043
val signature: String,
4144
)
4245

46+
@JsonClass(generateAdapter = true)
4347
data class ScriptletsSettings(
4448
val version: String,
4549
val scriptlets: Map<String, ScriptletEntry>,

0 commit comments

Comments
 (0)