UnitTestBot · tochilinak · Feb 21, 2024 · Feb 20, 2024 · Feb 20, 2024 · Feb 20, 2024
diff --git a/gradle.properties b/gradle.properties
@@ -102,6 +102,8 @@ commonsIOVersion=2.11.0
 javaxVersion=2.2
 jakartaVersion=3.1.0
 jacoDbVersion=1.4.3
+moshiVersion=1.15.1
+pythonTypesAPIHash=e5a5d9c
 
 # use latest Java 8 compaitable Spring and Spring Boot versions
 springVersion=5.3.28

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -81,7 +81,6 @@ if (pythonIde.split(",").contains(ideType)) {
     include("utbot-cli-python")
     include("utbot-intellij-python")
     include("utbot-python-parser")
-    include("utbot-python-types")
     include("utbot-python-executor")
 }
 

diff --git a/utbot-cli-python/build.gradle b/utbot-cli-python/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     implementation group: 'com.github.ajalt.clikt', name: 'clikt', version: cliktVersion
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j2Version
+    implementation group: 'com.github.UnitTestBot', name: 'PythonTypesAPI', version: pythonTypesAPIHash
 }
 
 processResources {

diff --git a/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/PythonTypeInferenceCommand.kt b/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/PythonTypeInferenceCommand.kt
@@ -8,7 +8,7 @@ import com.github.ajalt.clikt.parameters.options.split
 import com.github.ajalt.clikt.parameters.types.long
 import mu.KotlinLogging
 import org.utbot.python.newtyping.inference.TypeInferenceProcessor
-import org.utbot.python.newtyping.pythonTypeRepresentation
+import org.utpython.types.pythonTypeRepresentation
 import org.utbot.python.utils.Fail
 import org.utbot.python.utils.RequirementsUtils.requirements
 import org.utbot.python.utils.Success

diff --git a/utbot-intellij-main/src/main/resources/settings.properties b/utbot-intellij-main/src/main/resources/settings.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 utbot.org
+# Copyright (c) 2024 utbot.org
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/utbot-intellij-python/build.gradle.kts b/utbot-intellij-python/build.gradle.kts
@@ -59,6 +59,8 @@ tasks {
     }
 }
 
+val pythonTypesAPIHash: String by rootProject
+
 dependencies {
     implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
@@ -67,6 +69,7 @@ dependencies {
 
     //Family
     implementation(project(":utbot-python"))
+    implementation("com.github.UnitTestBot:PythonTypesAPI:$pythonTypesAPIHash")
 }
 
 intellij {

diff --git a/utbot-python-types/.gitignore b/utbot-python-types/.gitignore
diff --git a/utbot-python-types/build.gradle.kts b/utbot-python-types/build.gradle.kts
diff --git a/utbot-python-types/src/main/kotlin/org/utbot/python/newtyping/PythonDefinition.kt b/utbot-python-types/src/main/kotlin/org/utbot/python/newtyping/PythonDefinition.kt