From 1ba0a49c87110640e9a7d4645dc3d63b40cd18bd Mon Sep 17 00:00:00 2001
From: ezechuka <ezechukwuka9@gmail.com>
Date: Tue, 12 Apr 2022 23:19:08 +0100
Subject: [PATCH] migrated gradle build files to kotlin dsl; switched from kapt
 to ksp

---
 .idea/compiler.xml                            |  3 +-
 .idea/gradle.xml                              |  2 +-
 .idea/kotlinScripting.xml                     |  6 ++
 .idea/misc.xml                                |  2 +-
 .idea/runConfigurations.xml                   | 10 ---
 app/build.gradle                              | 63 ---------------
 app/build.gradle.kts                          | 75 +++++++++++++++++
 .../main/java/com/javalon/roomie/Person.kt    |  5 +-
 build.gradle                                  | 31 -------
 build.gradle.kts                              | 20 +++++
 gradle.properties                             |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 roomie-annotation/build.gradle                | 20 -----
 roomie-annotation/build.gradle.kts            | 19 +++++
 .../com/javalon}/AddConverter.kt              |  4 +-
 roomie-processor/build.gradle                 | 30 -------
 roomie-processor/build.gradle.kts             | 30 +++++++
 roomie-processor/src/main/AndroidManifest.xml |  5 --
 .../roomie_processor/model/ConverterData.kt   |  6 --
 .../roomie_processor/processor/Processor.kt   | 81 -------------------
 .../codegen/TypeConverterBuilder.kt           | 38 ++++++---
 .../logger/ProcessorLogger.kt                 |  0
 .../processor/ConverterProcessor.kt           | 81 +++++++++++++++++++
 .../processor/ConverterProcessorProvider.kt   | 15 ++++
 ...ols.ksp.processing.SymbolProcessorProvider |  1 +
 .../javax.annotation.processing.Processor     |  1 -
 settings.gradle                               |  4 -
 settings.gradle.kts                           | 27 +++++++
 28 files changed, 313 insertions(+), 272 deletions(-)
 create mode 100644 .idea/kotlinScripting.xml
 delete mode 100644 .idea/runConfigurations.xml
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 delete mode 100644 roomie-annotation/build.gradle
 create mode 100644 roomie-annotation/build.gradle.kts
 rename roomie-annotation/src/main/{java/com/javalon/roomie_annotation => kotlin/com/javalon}/AddConverter.kt (61%)
 delete mode 100644 roomie-processor/build.gradle
 create mode 100644 roomie-processor/build.gradle.kts
 delete mode 100644 roomie-processor/src/main/AndroidManifest.xml
 delete mode 100644 roomie-processor/src/main/java/com/javalon/roomie_processor/model/ConverterData.kt
 delete mode 100644 roomie-processor/src/main/java/com/javalon/roomie_processor/processor/Processor.kt
 rename roomie-processor/src/main/{java => kotlin}/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt (54%)
 rename roomie-processor/src/main/{java => kotlin}/com/javalon/roomie_processor/logger/ProcessorLogger.kt (100%)
 create mode 100644 roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessor.kt
 create mode 100644 roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessorProvider.kt
 create mode 100644 roomie-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
 delete mode 100644 roomie-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6b11765..c54c46b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8">
-      <module name="Roomie.app" target="11" />
+    <bytecodeTargetLevel target="11">
       <module name="Roomie.roomie-abstractprocessor" target="1.7" />
       <module name="Roomie.roomie-process" target="11" />
       <module name="Roomie.roomie-processor2" target="11" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 307a7a5..ea48cf2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
new file mode 100644
index 0000000..bc444de
--- /dev/null
+++ b/.idea/kotlinScripting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinScriptingSettings">
+    <option name="suppressDefinitionsCheck" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fe0fc87..6199cc2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index bba8fb9..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-}
-
-android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        applicationId "com.javalon.roomie"
-        minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            java {
-                srcDir "${buildDir.absolutePath}/generated/source/kaptKotlin/"
-            }
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation("androidx.room:room-runtime:2.4.1")
-//    implementation project(':roomie-annotation')
-//    kapt project(':roomie-processor')
-
-    implementation 'com.github.ezechuka.Roomie:core:1.0.0'
-    kapt 'com.github.ezechuka.Roomie:generator:1.0.0'
-
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..e0e81db
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,75 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("com.google.devtools.ksp")
+}
+
+android {
+    compileSdkVersion(31)
+    buildToolsVersion("30.0.3")
+
+    defaultConfig {
+        applicationId("com.javalon.roomie")
+        minSdkVersion(21)
+        targetSdkVersion(31)
+        versionCode(1)
+        versionName("1.0")
+
+        testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
+    }
+
+    buildTypes {
+       getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+
+        getByName("debug") {
+            sourceSets {
+                getByName("main") {
+                    java.srcDir(File("build/generated/ksp/debug/kotlin"))
+                }
+            }
+        }
+        getByName("release") {
+            sourceSets {
+                getByName("main") {
+                    java.srcDir(File("build/generated/ksp/release/kotlin"))
+                }
+            }
+
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+}
+
+dependencies {
+    val kotlinVersion: String by project
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
+    implementation("com.google.code.gson:gson:2.9.0")
+    implementation("androidx.room:room-runtime:2.4.1")
+
+    implementation(project(":roomie-annotation"))
+    ksp(project(":roomie-processor"))
+
+    testImplementation("junit:junit:4.+")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/javalon/roomie/Person.kt b/app/src/main/java/com/javalon/roomie/Person.kt
index b6d4bd4..1f4eecc 100644
--- a/app/src/main/java/com/javalon/roomie/Person.kt
+++ b/app/src/main/java/com/javalon/roomie/Person.kt
@@ -1,3 +1,6 @@
 package com.javalon.roomie
 
-data class Person()
+import com.javalon.AddConverter
+
+//@AddConverter(name = "PeopleConverter")
+//data class Person(val firstName: String, val lastName: List<String>)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 03dde4c..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.5.0"
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:4.2.1"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://jitpack.io'}
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..9047d65
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,20 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    val kotlinVersion: String by project
+    val kspVersion: String by project
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:4.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kspVersion")
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 2521752..66073c2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+kotlinVersion=1.5.30
+kspVersion=1.5.30-1.0.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 161f538..cf09989 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Feb 11 13:03:25 WAT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/roomie-annotation/build.gradle b/roomie-annotation/build.gradle
deleted file mode 100644
index 755bccc..0000000
--- a/roomie-annotation/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-plugins {
-    id 'kotlin'
-    id 'com.github.dcendents.android-maven'
-}
-
-group = "com.github.ezechuka"
-version = "1.0.0-beta01"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}
\ No newline at end of file
diff --git a/roomie-annotation/build.gradle.kts b/roomie-annotation/build.gradle.kts
new file mode 100644
index 0000000..bc18cf5
--- /dev/null
+++ b/roomie-annotation/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    id("kotlin")
+    id("maven-publish")
+}
+
+group = "com.github.ezechuka"
+version = "1.0.0-beta02"
+
+java {
+    withSourcesJar()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file
diff --git a/roomie-annotation/src/main/java/com/javalon/roomie_annotation/AddConverter.kt b/roomie-annotation/src/main/kotlin/com/javalon/AddConverter.kt
similarity index 61%
rename from roomie-annotation/src/main/java/com/javalon/roomie_annotation/AddConverter.kt
rename to roomie-annotation/src/main/kotlin/com/javalon/AddConverter.kt
index 807a6f9..0ee7dda 100644
--- a/roomie-annotation/src/main/java/com/javalon/roomie_annotation/AddConverter.kt
+++ b/roomie-annotation/src/main/kotlin/com/javalon/AddConverter.kt
@@ -1,4 +1,4 @@
-package com.javalon.roomie_annotation
+package com.javalon
 
 /**
  * Automatically generates a TypeConverter
@@ -6,4 +6,4 @@ package com.javalon.roomie_annotation
  */
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.CLASS)
-annotation class AddConverter(val name: String = "")
\ No newline at end of file
+annotation class AddConverter(val name: String = "", val asList: Boolean = false)
\ No newline at end of file
diff --git a/roomie-processor/build.gradle b/roomie-processor/build.gradle
deleted file mode 100644
index 3737e95..0000000
--- a/roomie-processor/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-plugins {
-    id 'kotlin'
-    id 'com.github.dcendents.android-maven'
-}
-
-group = "com.github.ezechuka"
-version = "1.0.0-beta01"
-
-sourceSets.main {
-    java.srcDirs("src/main/java")
-}
-
-repositories {
-    mavenCentral()
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation project(':roomie-annotation')
-    compileOnly project(':roomie-annotation')
-
-    implementation 'com.squareup:kotlinpoet:1.4.4'
-    implementation 'com.google.code.gson:gson:2.9.0'
-}
\ No newline at end of file
diff --git a/roomie-processor/build.gradle.kts b/roomie-processor/build.gradle.kts
new file mode 100644
index 0000000..227893c
--- /dev/null
+++ b/roomie-processor/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+    id("kotlin")
+    id("maven-publish")
+}
+
+group = "com.github.ezechuka"
+version = "1.0.0-beta02"
+
+java {
+    withSourcesJar()
+}
+
+val kspVersion: String by project
+
+dependencies {
+    implementation("com.google.devtools.ksp:symbol-processing-api:$kspVersion")
+
+    implementation(project(":roomie-annotation"))
+
+    implementation("com.squareup:kotlinpoet:1.4.4")
+    implementation("com.google.code.gson:gson:2.9.0")
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file
diff --git a/roomie-processor/src/main/AndroidManifest.xml b/roomie-processor/src/main/AndroidManifest.xml
deleted file mode 100644
index cca15f1..0000000
--- a/roomie-processor/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.javalon.roomie_processor">
-
-</manifest>
\ No newline at end of file
diff --git a/roomie-processor/src/main/java/com/javalon/roomie_processor/model/ConverterData.kt b/roomie-processor/src/main/java/com/javalon/roomie_processor/model/ConverterData.kt
deleted file mode 100644
index b12ef0e..0000000
--- a/roomie-processor/src/main/java/com/javalon/roomie_processor/model/ConverterData.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.javalon.roomie_processor.model
-
-data class ConverterData(
-    val packageName: String,
-    val modelName: String
-)
diff --git a/roomie-processor/src/main/java/com/javalon/roomie_processor/processor/Processor.kt b/roomie-processor/src/main/java/com/javalon/roomie_processor/processor/Processor.kt
deleted file mode 100644
index 439ba64..0000000
--- a/roomie-processor/src/main/java/com/javalon/roomie_processor/processor/Processor.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.javalon.roomie_processor.processor
-
-import com.javalon.roomie_annotation.AddConverter
-import com.javalon.roomie_processor.codegen.TypeConverterBuilder
-import com.javalon.roomie_processor.logger.ProcessorLogger
-import com.javalon.roomie_processor.model.ConverterData
-import com.squareup.kotlinpoet.FileSpec
-import java.io.File
-import javax.annotation.processing.AbstractProcessor
-import javax.annotation.processing.ProcessingEnvironment
-import javax.annotation.processing.RoundEnvironment
-import javax.annotation.processing.SupportedSourceVersion
-import javax.lang.model.SourceVersion
-import javax.lang.model.element.Element
-import javax.lang.model.element.TypeElement
-import javax.lang.model.util.Elements
-import javax.lang.model.util.Types
-
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-class Processor: AbstractProcessor() {
-
-    private lateinit var typeUtils: Types
-    private lateinit var elemUtils: Elements
-    private lateinit var logger: ProcessorLogger
-
-    override fun init(processingEnv: ProcessingEnvironment?) {
-        super.init(processingEnv)
-        processingEnv?.let {
-            typeUtils = it.typeUtils
-            elemUtils = it.elementUtils
-            logger = ProcessorLogger(it)
-        }
-    }
-
-    override fun getSupportedAnnotationTypes(): MutableSet<String> {
-        return mutableSetOf(AddConverter::class.java.canonicalName)
-    }
-
-    override fun process(p0: MutableSet<out TypeElement>?, roundEnv: RoundEnvironment?): Boolean {
-       val kaptKotlinGeneratedDir = processingEnv.options[KAPT_KOTLIN_GENERATED_OPTION_NAME]
-           ?: return false
-
-       roundEnv?.getElementsAnnotatedWith(AddConverter::class.java)?.forEach {
-            if (!validateTypeElement(it)) {
-                logger.e("Must be applied to classes only.", it)
-                return false
-            }
-
-           val converterData = getConverterData(it)
-           val converter = it.getAnnotation(AddConverter::class.java)
-           val fileName = if (converter.name.isEmpty()) {
-               "${converterData.modelName}Converter"
-           } else {
-              converter.name
-           }
-
-           FileSpec.builder(converterData.packageName, fileName)
-               .addType(TypeConverterBuilder(converterData, fileName).build())
-               .build()
-               .writeTo(File(kaptKotlinGeneratedDir))
-
-       }
-        return true
-    }
-
-    private fun getConverterData(elem: Element): ConverterData {
-        val packageName = processingEnv.elementUtils.getPackageOf(elem).toString()
-        val modelName = elem.simpleName.toString()
-        return ConverterData(packageName, modelName)
-    }
-
-    private fun validateTypeElement(elem: Element): Boolean {
-        (elem as? TypeElement)?.let {
-            return true
-        } ?: return false
-    }
-
-    companion object {
-        const val KAPT_KOTLIN_GENERATED_OPTION_NAME = "kapt.kotlin.generated"
-    }
-}
\ No newline at end of file
diff --git a/roomie-processor/src/main/java/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt
similarity index 54%
rename from roomie-processor/src/main/java/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt
rename to roomie-processor/src/main/kotlin/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt
index c74df0b..0fa4d62 100644
--- a/roomie-processor/src/main/java/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt
+++ b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/codegen/TypeConverterBuilder.kt
@@ -1,22 +1,23 @@
 package com.javalon.roomie_processor.codegen
 
 import com.google.gson.Gson
-import com.javalon.roomie_processor.model.ConverterData
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 
 class TypeConverterBuilder(
-    private val data: ConverterData,
-    private val fileName: String = String()
+    private val packageName: String,
+    private val modelName: String,
+    private val fileName: String = String(),
+    private val asList: Boolean = false
 ) {
-    private val modelClassName = ClassName(data.packageName, data.modelName)
+    private val modelClassName = ClassName(packageName, modelName)
     private val typeTokenInterfaceName = ClassName("com.google.gson.reflect", "TypeToken")
-    private val itemsListClassName = ClassName("kotlin.collections", "List")
+    private val converterTypeListClassName = ClassName("kotlin.collections", "List")
         .parameterizedBy(modelClassName)
     private val typeConverterClassName = ClassName("androidx.room", "TypeConverter")
 
     fun build(): TypeSpec = if (fileName.isEmpty()) {
-        TypeSpec.classBuilder("${data.modelName}Converter")
+        TypeSpec.classBuilder("${modelName}Converter")
             .addModifiers(KModifier.OPEN)
             .addBaseMethods()
             .build()
@@ -30,15 +31,28 @@ class TypeConverterBuilder(
     private fun TypeSpec.Builder.addBaseMethods(): TypeSpec.Builder = apply {
         addFunction(
             FunSpec.builder("fromString")
-            .addAnnotation(typeConverterClassName)
-                .returns(itemsListClassName)
+                .addAnnotation(typeConverterClassName)
+                .returns(
+                    if (asList)
+                        converterTypeListClassName
+                    else modelClassName
+                )
                 .addParameter("value", String::class)
                 .addStatement(
                     "val type = object : %T<%T>() {}.type",
                     typeTokenInterfaceName,
-                    itemsListClassName
+                    if (asList)
+                        converterTypeListClassName
+                    else modelClassName,
+                )
+                .addStatement(
+                    "return %T().fromJson<%T>(value, type)",
+                    Gson::class,
+                    if (asList)
+                        converterTypeListClassName
+                    else
+                        modelClassName
                 )
-                .addStatement("return %T().fromJson<%T>(value, type)", Gson::class, itemsListClassName)
                 .build()
         )
 
@@ -46,9 +60,9 @@ class TypeConverterBuilder(
             FunSpec.builder("fromList")
                 .addAnnotation(typeConverterClassName)
                 .returns(String::class)
-                .addParameter("list", itemsListClassName)
+                .addParameter("value", if (asList) converterTypeListClassName else modelClassName)
                 .addStatement("val gson = %T()", Gson::class)
-                .addStatement("return gson.toJson(list)")
+                .addStatement("return gson.toJson(value)")
                 .build()
         )
     }
diff --git a/roomie-processor/src/main/java/com/javalon/roomie_processor/logger/ProcessorLogger.kt b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/logger/ProcessorLogger.kt
similarity index 100%
rename from roomie-processor/src/main/java/com/javalon/roomie_processor/logger/ProcessorLogger.kt
rename to roomie-processor/src/main/kotlin/com/javalon/roomie_processor/logger/ProcessorLogger.kt
diff --git a/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessor.kt b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessor.kt
new file mode 100644
index 0000000..1f98116
--- /dev/null
+++ b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessor.kt
@@ -0,0 +1,81 @@
+package com.javalon.roomie_processor.processor
+
+import com.google.devtools.ksp.processing.CodeGenerator
+import com.google.devtools.ksp.processing.Dependencies
+import com.google.devtools.ksp.processing.KSPLogger
+import com.google.devtools.ksp.processing.Resolver
+import com.google.devtools.ksp.processing.SymbolProcessor
+import com.google.devtools.ksp.symbol.ClassKind
+import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSAnnotation
+import com.google.devtools.ksp.symbol.KSClassDeclaration
+import com.google.devtools.ksp.symbol.KSValueArgument
+import com.google.devtools.ksp.symbol.KSVisitorVoid
+import com.google.devtools.ksp.validate
+import com.javalon.roomie_processor.codegen.TypeConverterBuilder
+import com.squareup.kotlinpoet.FileSpec
+
+class ConverterProcessor(
+    private val codeGenerator: CodeGenerator,
+    private val logger: KSPLogger,
+    private val options: Map<String, String>
+) : SymbolProcessor {
+
+    override fun process(resolver: Resolver): List<KSAnnotated> {
+        val symbols = resolver.getSymbolsWithAnnotation("com.javalon.AddConverter")
+            .filterIsInstance<KSClassDeclaration>()
+
+        if (!symbols.iterator().hasNext()) return emptyList()
+
+        symbols.forEach { it.accept(Visitor(), Unit) }
+        return symbols.filterNot { it.validate() }.toList()
+    }
+
+    inner class Visitor : KSVisitorVoid() {
+        override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
+            if (classDeclaration.classKind != ClassKind.CLASS) {
+                logger.error("@AddConverter must be applied to classes only.")
+                return
+            }
+
+            val annotation: KSAnnotation = classDeclaration.annotations.first {
+                it.shortName.asString() == "AddConverter"
+            }
+
+            val nameArgument: KSValueArgument = annotation.arguments.first { arg ->
+                arg.name?.asString() == "name"
+            }
+
+            val asListArgument: KSValueArgument = annotation.arguments.first { arg ->
+                arg.name?.asString() == "asList"
+            }
+
+            val packageName = classDeclaration.packageName.asString()
+            val modelName = classDeclaration.simpleName.asString()
+            val converterName = nameArgument.value as String
+            val asList = asListArgument.value as Boolean
+            val fileName = if (converterName.isBlank() && !asList) {
+                "${modelName}Converter"
+            } else if (converterName.isBlank() && asList) {
+                "${modelName}ListConverter"
+            } else {
+                converterName
+            }
+
+            val fileSpec = FileSpec.builder(packageName, fileName)
+                .addType(TypeConverterBuilder(packageName, modelName, fileName, asList).build())
+                .build()
+
+            codeGenerator.createNewFile(
+                dependencies = Dependencies(false),
+                packageName = packageName,
+                fileName = fileName
+            ).use { outputStream ->
+                outputStream.writer()
+                    .use {
+                        fileSpec.writeTo(it)
+                    }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessorProvider.kt b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessorProvider.kt
new file mode 100644
index 0000000..ae9dbac
--- /dev/null
+++ b/roomie-processor/src/main/kotlin/com/javalon/roomie_processor/processor/ConverterProcessorProvider.kt
@@ -0,0 +1,15 @@
+package com.javalon.roomie_processor.processor
+
+import com.google.devtools.ksp.processing.SymbolProcessor
+import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
+import com.google.devtools.ksp.processing.SymbolProcessorProvider
+
+class ConverterProcessorProvider: SymbolProcessorProvider {
+    override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
+        return ConverterProcessor(
+            codeGenerator = environment.codeGenerator,
+            logger = environment.logger,
+            options = environment.options
+        )
+    }
+}
\ No newline at end of file
diff --git a/roomie-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/roomie-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
new file mode 100644
index 0000000..a622ebd
--- /dev/null
+++ b/roomie-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -0,0 +1 @@
+com.javalon.roomie_processor.processor.ConverterProcessorProvider
\ No newline at end of file
diff --git a/roomie-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/roomie-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 33a4a3a..0000000
--- a/roomie-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-com.javalon.roomie_processor.processor.Processor
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 747e2a6..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-rootProject.name = "Roomie"
-include ':app'
-include ':roomie-processor'
-include ':roomie-annotation'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..5f168f2
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,27 @@
+pluginManagement {
+    val kotlinVersion: String by settings
+    val kspVersion: String by settings
+    plugins {
+        id("com.google.devtools.ksp") version kspVersion
+        kotlin("jvm") version kotlinVersion
+    }
+    repositories {
+        gradlePluginPortal()
+        google()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+    }
+}
+
+rootProject.name = "Roomie"
+
+include(":app")
+include(":roomie-processor")
+include(":roomie-annotation")