diff --git a/build.gradle b/build.gradle index c97da999..9d8f1173 100644 --- a/build.gradle +++ b/build.gradle @@ -14,4 +14,13 @@ buildscript { } } +subprojects { + apply plugin: "kotlin" + + repositories { + mavenCentral() + maven { url 'https://jitpack.io' } + } +} + apply plugin: "com.github.ben-manes.versions" \ No newline at end of file diff --git a/model/build.gradle b/model/build.gradle index 87f496b4..0398edc1 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -1,15 +1,12 @@ -apply plugin: "kotlin" - -repositories { - mavenCentral() - maven { url 'https://jitpack.io' } +plugins { + id("com.google.devtools.ksp").version("1.6.10-1.0.2") } dependencies { + ksp("com.squareup.moshi:moshi-kotlin-codegen:1.13.0") implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN_VERSION}" - implementation 'com.squareup.moshi:moshi-kotlin:1.13.0' + implementation 'com.squareup.moshi:moshi:1.13.0' implementation 'com.squareup.okhttp3:okhttp:4.9.3' - } diff --git a/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt b/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt index e65077dd..3e7b7bed 100644 --- a/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt +++ b/model/src/main/kotlin/org/ethereum/lists/chains/model/Chain.kt @@ -1,5 +1,8 @@ package org.ethereum.lists.chains.model +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) data class Chain( val name: String, val shortName: String, diff --git a/model/src/main/kotlin/org/ethereum/lists/chains/model/Explorer.kt b/model/src/main/kotlin/org/ethereum/lists/chains/model/Explorer.kt index 932d9119..0da3eba7 100644 --- a/model/src/main/kotlin/org/ethereum/lists/chains/model/Explorer.kt +++ b/model/src/main/kotlin/org/ethereum/lists/chains/model/Explorer.kt @@ -1,5 +1,8 @@ package org.ethereum.lists.chains.model +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) data class Explorer( val name: String, val url: String, diff --git a/processor/build.gradle b/processor/build.gradle index 1b4b6eb9..3954b70d 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -1,13 +1,7 @@ -apply plugin: "kotlin" apply plugin: "application" mainClassName = "org.ethereum.lists.chains.MainKt" -repositories { - mavenCentral() - maven { url 'https://jitpack.io' } -} - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN_VERSION}" @@ -17,7 +11,7 @@ dependencies { implementation "com.github.komputing.kethereum:crypto_impl_bouncycastle:${KETHEREUM_VERSION}" implementation 'com.beust:klaxon:5.5' - implementation 'com.squareup.moshi:moshi-kotlin:1.13.0' + implementation 'com.squareup.moshi:moshi:1.13.0' implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation project(":model") diff --git a/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt b/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt index 74ef5bdf..7fb8cdf0 100644 --- a/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt +++ b/processor/src/main/kotlin/org/ethereum/lists/chains/Env.kt @@ -2,7 +2,6 @@ package org.ethereum.lists.chains import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import org.ethereum.lists.chains.model.Chain val mandatory_fields = listOf( @@ -25,5 +24,5 @@ val optionalFields = listOf( "parent" ) -val moshi: Moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build() +val moshi: Moshi = Moshi.Builder().build() val chainAdapter: JsonAdapter = moshi.adapter(Chain::class.java)