MOD: module and variable name

kanyun-inc · Nov 7, 2023 · 80eb151 · 80eb151
1 parent 4d44653
commit 80eb151
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 28 deletions.
diff --git a/kudos-json-reader/build.gradle.kts → kudos-android-json-reader/build.gradle.kts b/kudos-json-reader/build.gradle.kts → kudos-android-json-reader/build.gradle.kts
diff --git a/kudos-android-json-reader/gradle.properties b/kudos-android-json-reader/gradle.properties
@@ -0,0 +1 @@
+POM_NAME=kudos-android-json-reader
diff --git a/...nyun/kudos/json/reader/KudosJsonReader.kt → ...dos/json/reader/KudosAndroidJsonReader.kt b/...nyun/kudos/json/reader/KudosJsonReader.kt → ...dos/json/reader/KudosAndroidJsonReader.kt
@@ -19,7 +19,7 @@ package com.kanyun.kudos.json.reader
 import android.util.JsonReader
 import com.kanyun.kudos.json.reader.adapter.KudosJsonAdapter
 
-object KudosJsonReader {
+object KudosAndroidJsonReader {
     inline fun <reified T> fromJson(json: String): T {
         return fromJson(json, T::class.java)
     }

diff --git a/...s/json/reader/adapter/KudosJsonAdapter.kt → ...s/json/reader/adapter/KudosJsonAdapter.kt b/...s/json/reader/adapter/KudosJsonAdapter.kt → ...s/json/reader/adapter/KudosJsonAdapter.kt
diff --git a/...n/reader/adapter/ParameterizedTypeImpl.kt → ...n/reader/adapter/ParameterizedTypeImpl.kt b/...n/reader/adapter/ParameterizedTypeImpl.kt → ...n/reader/adapter/ParameterizedTypeImpl.kt
diff --git a/kudos-compiler/build.gradle.kts b/kudos-compiler/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     testImplementation(kotlin("test-junit"))
     testImplementation(project(":kudos-gson"))
     testImplementation(project(":kudos-jackson"))
-    testImplementation(project(":kudos-json-reader"))
+    testImplementation(project(":kudos-android-json-reader"))
     testImplementation(project(":android-json-reader"))
     testImplementation("org.jetbrains.kotlin:kotlin-noarg:1.8.20")
     testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")

diff --git a/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/k1/KudosSyntheticResolveExtension.kt b/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/k1/KudosSyntheticResolveExtension.kt
@@ -69,11 +69,11 @@ class KudosSyntheticResolveExtension : SyntheticResolveExtension {
                 )
             }
             if (KUDOS_JSON_ADAPTER !in superTypeNames) {
-                val kudosValidator = thisDescriptor.module.findClassAcrossModuleDependencies(KUDOS_JSON_ADAPTER_CLASS_ID)!!
+                val kudosJsonAdapter = thisDescriptor.module.findClassAcrossModuleDependencies(KUDOS_JSON_ADAPTER_CLASS_ID)!!
                 supertypes.add(
                     KotlinTypeFactory.simpleNotNullType(
                         TypeAttributes.Empty,
-                        kudosValidator,
+                        kudosJsonAdapter,
                         listOf(TypeProjectionImpl(thisDescriptor.defaultType)),
                     ),
                 )

diff --git a/kudos-compiler/src/test/java/com/kanyun/kudos/compiler/base/TestBase.kt b/kudos-compiler/src/test/java/com/kanyun/kudos/compiler/base/TestBase.kt
@@ -109,11 +109,11 @@ open class TestBase {
     private fun jsonReaderDeserialize(): String {
         return """
             // FILE: JsonReader.kt
-            import com.kanyun.kudos.json.reader.KudosJsonReader
+            import com.kanyun.kudos.json.reader.KudosAndroidJsonReader
             
             inline fun <reified T: Any> deserialize(string: String): T? {
                 return try {
-                    val t: T = KudosJsonReader.fromJson(string)
+                    val t: T = KudosAndroidJsonReader.fromJson(string)
                     println(t)
                     t
                 } catch (e: Exception) {

diff --git a/kudos-compiler/src/test/java/com/kanyun/kudos/compiler/generator/TestsGenerator.kt b/kudos-compiler/src/test/java/com/kanyun/kudos/compiler/generator/TestsGenerator.kt
@@ -62,26 +62,27 @@ fun main() {
          */
         class KudosTests : TestBase() {
            
-            ${caseDir.listFiles().orEmpty()
-        .flatMap {
-            if (it.isDirectory) {
-                it.listFiles().orEmpty().toList()
-            } else {
-                listOf(it)
+            ${
+        caseDir.listFiles().orEmpty()
+            .flatMap {
+                if (it.isDirectory) {
+                    it.listFiles().orEmpty().toList()
+                } else {
+                    listOf(it)
+                }
             }
-        }
-        .map {
-            val parentDir = it.parentFile.name
-            if (parentDir == "testData") {
-                it.nameWithoutExtension
-            }else {
-                "${parentDir}_${it.nameWithoutExtension}"
+            .map {
+                val parentDir = it.parentFile.name
+                if (parentDir == "testData") {
+                    it.nameWithoutExtension
+                } else {
+                    "${parentDir}_${it.nameWithoutExtension}"
+                }
+            }
+            .sortedBy { it }
+            .joinToString("\n") {
+                "@Test\nfun `${it.replaceFirstChar { it.lowercaseChar() }}`() = testBase()\n"
             }
-        }
-        .sortedBy { it }
-        .joinToString("\n") {
-            "@Test\nfun `${it.replaceFirstChar { it.lowercaseChar() }}`() = testBase()\n"
-        }
     }
         }
     """.trimIndent()

diff --git a/kudos-gradle-plugin/src/main/java/com/kanyun/kudos/gradle/KudosGradlePlugin.kt b/kudos-gradle-plugin/src/main/java/com/kanyun/kudos/gradle/KudosGradlePlugin.kt
@@ -47,7 +47,7 @@ open class KudosGradlePlugin : KotlinCompilerPluginSupportPlugin {
                     config += "${BuildConfig.KOTLIN_PLUGIN_GROUP}:kudos-jackson:${BuildConfig.KOTLIN_PLUGIN_VERSION}"
                 }
                 // TODO: Add json reader config
-                config += "${BuildConfig.KOTLIN_PLUGIN_GROUP}:kudos-json-reader:${BuildConfig.KOTLIN_PLUGIN_VERSION}"
+                config += "${BuildConfig.KOTLIN_PLUGIN_GROUP}:kudos-android-json-reader:${BuildConfig.KOTLIN_PLUGIN_VERSION}"
                 config += "${BuildConfig.KOTLIN_PLUGIN_GROUP}:kudos-annotations:${BuildConfig.KOTLIN_PLUGIN_VERSION}"
                 config += "${BuildConfig.KOTLIN_PLUGIN_GROUP}:kudos-runtime:${BuildConfig.KOTLIN_PLUGIN_VERSION}"
             }

diff --git a/kudos-json-reader/gradle.properties b/kudos-json-reader/gradle.properties
diff --git a/kudos-sample/kudos-maven-sample/pom.xml b/kudos-sample/kudos-maven-sample/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>com.kanyun.kudos</groupId>
-            <artifactId>kudos-json-reader</artifactId>
+            <artifactId>kudos-android-json-reader</artifactId>
             <version>${kudos.version}</version>
         </dependency>
         <dependency>

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,5 +13,5 @@ include(":kudos-annotations")
 include(":kudos-runtime")
 include(":kudos-gson")
 include(":kudos-jackson")
-include(":kudos-json-reader")
+include(":kudos-android-json-reader")
 include(":android-json-reader")