Feature/convert for to (#26)

* Update Gradle

* Update Libraries

* Extend MapConvert

* Make MapConvert working for to in KOMMMap annotation

* Refactoring

* Add Examples

* Increase version

* Update README

* Fix issue

Author: Scogun

README.md

@@ -73,10 +73,10 @@ The **Kotlin Object Multiplatform Mapper** provides you a possibility to generat
 #### JVM Project
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "2.1.0-1.0.28"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
-val kommVersion = "0.22.8"
+val kommVersion = "0.24.3"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -86,10 +86,10 @@ depensencies {
 #### Multiplatform Project
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "2.1.0-1.0.28"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
-val kommVersion = "0.22.8"
+val kommVersion = "0.24.3"
 
 kotlin {
     jvm {
@@ -260,7 +260,7 @@ fun SourceObject.toDestinationObject(): DestinationObject = DestinationObject(
 ### Use Converter
 #### Converter declaration
 ```kotlin
-class CostConverter(source: SourceObject) : KOMMConverter<SourceObject, Double, String>(source) {
+class CostConverter(source: SourceObject) : KOMMConverter<SourceObject, Double, DestinationObject, String>(source) {
 
     override fun convert(sourceMember: Double) = "$sourceMember ${source.currency}"
 }
@@ -275,7 +275,7 @@ class SourceObject {
 @KOMMMap(from = [SourceObject::class])
 data class DestinationObject(
     //...
-    @MapConvert<SourceObject, CostConverter>(CostConverter::class)
+    @MapConvert<SourceObject, DestinationObject, CostConverter>(CostConverter::class)
     val cost: String
 ) {
     //...
@@ -459,10 +459,10 @@ fun SecondSourceObject.toDestinationObject(): DestinationObject = DestinationObj
 ###### JVM Project
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "2.1.0-1.0.28"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
-val kommVersion = "0.22.8"
+val kommVersion = "0.24.3"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -473,10 +473,10 @@ depensencies {
 ###### Multiplatform Project
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "2.1.0-1.0.28"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
-val kommVersion = "0.22.8"
+val kommVersion = "0.24.3"
 
 //...
 
@@ -533,10 +533,10 @@ public fun SourceObject.toDestinationObject(): DestinationObject = DestinationOb
 ###### JVM Project
 ```kotlin
 plugins {
-    id("com.google.devtools.ksp") version "2.1.0-1.0.28"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
-val kommVersion = "0.22.8"
+val kommVersion = "0.24.3"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")

build.gradle.kts

@@ -6,13 +6,13 @@ plugins {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.12"
+    gradleVersion = "8.14"
 }
 
 allprojects {
     group = "com.ucasoft.komm"
 
-    version = "0.22.8"
+    version = "0.24.3"
 
     repositories {
         mavenCentral()

gradle/libs.versions.toml

@@ -3,10 +3,10 @@ kotlin = "2.0.21"
 ksp = "2.0.21-1.0.28"
 kotlin-poet = "1.18.1"
 compile-testing = "1.6.0"
-junit = "5.11.4"
+junit = "5.12.2"
 kotest = "5.9.1"
 kover = "0.9.1"
-mockk = "1.13.16"
+mockk = "1.14.2"
 classgraph = "4.8.179"
 exposed = "0.57.0"
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,6 +1,6 @@
 package com.ucasoft.komm.abstractions
 
-abstract class KOMMConverter<S, SM, DM>(protected val source: S) {
+abstract class KOMMConverter<S, SM, D, DM>(protected val source: S) {
 
     abstract fun convert(sourceMember: SM) : DM
 }

komm-annotations/src/main/kotlin/com/ucasoft/komm/abstractions/KOMMConverter.kt

@@ -6,4 +6,4 @@ import kotlin.reflect.KClass
 @Target(AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.SOURCE)
 @Repeatable
-annotation class MapConvert<S: Any, C : KOMMConverter<S, *, *>>(val converter: KClass<C>, val name: String = "")
+annotation class MapConvert<S: Any, D: Any, C : KOMMConverter<S, *, D, *>>(val converter: KClass<C>, val name: String = "")

komm-annotations/src/main/kotlin/com/ucasoft/komm/annotations/MapConvert.kt

@@ -29,7 +29,7 @@ class KOMMAnnotationFinder(private val forClass: KSType) {
             forClass.toClassName(),
             member,
             MapConvert::class.simpleName,
-            MapConvert<*, *>::converter.name
+            MapConvert<*, *, *>::converter.name
         )
 
     fun findSubstituteResolver(member: KSPropertyDeclaration): String? {
@@ -83,7 +83,7 @@ class KOMMAnnotationFinder(private val forClass: KSType) {
         }
 
         if (item.annotationType.toString() == MapConvert::class.simpleName) {
-            return listOf(item.annotationType.element!!.typeArguments.first().type!!.resolve().toClassName())
+            return item.annotationType.element!!.typeArguments.take(2).map {  it.type!!.resolve().toClassName() }
         }
 
         return emptyList()