Refactor EasyStore API (#6)

* Improved EasyStore API * Improved EasyStore API (2) * Code cleanup
kasem-sm · Aug 22, 2022 · c52eb9b · c52eb9b
1 parent b40d5ba
commit c52eb9b
Show file tree

Hide file tree

Showing 20 changed files with 606 additions and 237 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,6 @@ subprojects {
         kotlin {
             licenseHeaderFile project.rootProject.file('spotless/copyright.kt')
             target "**/*.kt"
-            ktlint().editorConfigOverride(['android': 'true', 'max_line_length': '200'])
         }
         format 'misc', {
             target '**/*.gradle', '**/*.md', '**/.gitignore'

diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/buildSrc/src/main/kotlin/LibraryConfigs.kt b/buildSrc/src/main/kotlin/LibraryConfigs.kt
@@ -1,4 +1,4 @@
 object LibraryConfigs {
     const val groupId = "com.kasem-sm.easystore"
-    const val version = "0.0.1-alpha"
+    const val version = "0.0.2-alpha"
 }
diff --git a/easystore-core/src/main/java/kasem/sm/easystore/core/EasyStore.kt b/easystore-core/src/main/java/kasem/sm/easystore/core/EasyStore.kt
@@ -6,4 +6,4 @@ package kasem.sm.easystore.core
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.SOURCE)
-annotation class EasyStore()
+annotation class EasyStore
diff --git a/easystore-core/src/main/java/kasem/sm/easystore/core/Retrieve.kt b/easystore-core/src/main/java/kasem/sm/easystore/core/Retrieve.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2022, Kasem S.M
+ * All rights reserved.
+ */
+package kasem.sm.easystore.core
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.SOURCE)
+annotation class Retrieve(
+    val preferenceKeyName: String
+)
diff --git a/easystore-core/src/main/java/kasem/sm/easystore/core/Store.kt b/easystore-core/src/main/java/kasem/sm/easystore/core/Store.kt
@@ -4,9 +4,8 @@
  */
 package kasem.sm.easystore.core
 
-@Target(AnnotationTarget.FUNCTION)
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.SOURCE)
 annotation class Store(
-    val preferenceKeyName: String,
-    val getterFunctionName: String
+    val preferenceKeyName: String
 )
diff --git a/easystore-processor/build.gradle.kts b/easystore-processor/build.gradle.kts
@@ -7,17 +7,23 @@ sourceSets.main {
     java.srcDirs("src/main/kotlin")
 }
 
-dependencies {
-    implementation("androidx.datastore:datastore-preferences-core:1.0.0")
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+}
 
+dependencies {
     implementation(project(":easystore-core"))
-    implementation("com.google.devtools.ksp:symbol-processing-api:1.7.10-1.0.6")
 
+    implementation("androidx.datastore:datastore-preferences-core:1.0.0")
+    implementation("com.google.devtools.ksp:symbol-processing-api:1.7.10-1.0.6")
+
     implementation("com.squareup:kotlinpoet:1.12.0")
     implementation("com.squareup:kotlinpoet-ksp:1.12.0")
 
     implementation("com.google.auto.service:auto-service-annotations:1.0")
     ksp("dev.zacsweers.autoservice:auto-service-ksp:1.0.0")
+
+    testImplementation("junit:junit:4.13.2")
 }
 
 rootProject.extra.apply {

diff --git a/easystore-processor/src/main/java/kasem/sm/easystore/processor/StoreProcessor.kt b/easystore-processor/src/main/java/kasem/sm/easystore/processor/StoreProcessor.kt
@@ -41,21 +41,18 @@ class StoreProcessor(
                 .forEach {
                     visitor = StoreVisitor(logger)
                     it.accept(visitor, Unit)
+                    storeFileGenerator = StoreFileGenerator(visitor)
+                    try {
+                        storeFileGenerator.fileSpec.build()
+                            .writeTo(codeGenerator = codeGenerator, aggregating = false)
+                    } catch (e: FileAlreadyExistsException) {
+                        logger.logging(e.message.toString())
+                    } catch (e: Exception) {
+                        logger.error(e.message.toString())
+                    }
                 }
 
-            if (::visitor.isInitialized) {
-                storeFileGenerator = StoreFileGenerator(visitor)
-
-                try {
-                    storeFileGenerator.fileSpec.build().writeTo(codeGenerator = codeGenerator, aggregating = false)
-                } catch (e: FileAlreadyExistsException) {
-                    logger.logging(e.message.toString())
-                } catch (e: Exception) {
-                    logger.error(e.message.toString())
-                }
-
-                unresolvedSymbols = resolved - validatedSymbols.toSet()
-            }
+            unresolvedSymbols = resolved - validatedSymbols.toSet()
         }
         return unresolvedSymbols
     }