fix: fix build issue

phodal · Jan 5, 2024 · 5fb6cf3 · 5fb6cf3
1 parent 3c7264f
commit 5fb6cf3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
     val kotlinVersion = "1.9.0"
     kotlin("jvm") version kotlinVersion apply false
 
+    kotlin("plugin.serialization") version "1.6.10"
+
     id("java-library")
     id("maven-publish")
     publishing

diff --git a/chapi-ast-go/src/test/kotlin/chapi/ast/goast/GoAnalyserTest.kt b/chapi-ast-go/src/test/kotlin/chapi/ast/goast/GoAnalyserTest.kt
@@ -127,16 +127,13 @@ func installController(g *gin.Engine) *gin.Engine {
     @Disabled
     fun analysisByDir() {
         val dir = "/Users/phodal/test/iam"
-        val codeContainer = GoAnalyser().analysisByDir(dir)
+        val files = File(dir).walkTopDown().filter { it.isFile && it.extension == "go" }.toList()
+        val codeContainer = files.map {
+            GoAnalyser().analysis(it.readText(), it.name)
+        }.toList()
         // write to file
         val json = Json.encodeToString(codeContainer)
         File("iam.json").writeText(json)
     }
 }
 
-private fun GoAnalyser.analysisByDir(dir: String): List<CodeContainer> {
-    val files = File(dir).walkTopDown().filter { it.isFile && it.extension == "go" }.toList()
-    return files.map {
-        analysis(it.readText(), it.name)
-    }.toList()
-}
diff --git a/chapi-ast-java/src/main/kotlin/chapi/ast/javaast/JavaFullIdentListener.kt b/chapi-ast-java/src/main/kotlin/chapi/ast/javaast/JavaFullIdentListener.kt
@@ -5,7 +5,6 @@ import chapi.domain.core.*
 import chapi.infra.Stack
 import org.antlr.v4.runtime.ParserRuleContext
 import org.antlr.v4.runtime.tree.ParseTree
-import kotlin.reflect.typeOf
 
 data class TargetTypePackage(val targetType: String, val packageName: String)
 data class JavaTargetType(var targetType: String = "", var callType: CallType = CallType.FUNCTION)
@@ -307,9 +306,9 @@ open class JavaFullIdentListener(fileName: String, val classes: List<String>) :
         var methodName = callee
 
         var targetTypeStr = targetType
-        val targetType = this.warpTargetFullType(targetTypeStr)
-        var callType = targetType.callType
-        val fullType = targetType.targetType
+        val wrapTargetType = this.warpTargetFullType(targetTypeStr)
+        var callType = wrapTargetType.callType
+        val fullType = wrapTargetType.targetType
 
         if (targetTypeStr == "super" || callee == "super") {
             callType = CallType.SUPER

diff --git a/chapi-domain/build.gradle.kts b/chapi-domain/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
-    // Kotlin reflection.
+
     testImplementation(kotlin("test"))
 
     // JUnit 5