0.6.0

Author: afollestad

README.md

@@ -56,8 +56,8 @@ code generation, so you *don't* need to write boilerplate and you *don't* need t
 
 ```gradle
 dependencies {
-  implementation "com.afollestad:ulfberht:0.5.0"
-  kapt "com.afollestad:ulfbert-processor:0.5.0"
+  implementation "com.afollestad:ulfberht:0.6.0"
+  kapt "com.afollestad:ulfbert-processor:0.6.0"
 }
 ```
 

RELEASE_NOTES.md

@@ -1,5 +1,3 @@
-0.5.0
+0.6.0
 
-* Instead of setting `parent` in the `Component` annotation, you assign a component `children`. See 
-the updated README.
-* Internal cleanup.
+* Qualifiers are annotation-based instead of string-based.

core/src/test/kotlin/com/afollestad/ulfberht/TestComponents.kt

@@ -44,7 +44,7 @@ class ComponentParent_Component() : ComponentParent, TestBaseComponent {
   override val originalType: KClass<*> = ComponentParent::class
   override val children: MutableSet<BaseComponent> = mutableSetOf()
   override val modules: Set<BaseModule> = setOf(Module1_Module(this))
-  override var runtimeDependencies: Map<String?, Any>? = null
+  override var runtimeDependencies: Map<String, Any>? = null
 
   override fun <T : Any> getProvider(
     wantedType: KClass<*>,
@@ -68,7 +68,7 @@ class ComponentChild1_Component() : ComponentChild1, TestBaseComponent {
   override val originalType: KClass<*> = ComponentParent::class
   override val children: MutableSet<BaseComponent> = mutableSetOf()
   override val modules: Set<BaseModule> = setOf(Module2_Module(this))
-  override var runtimeDependencies: Map<String?, Any>? = null
+  override var runtimeDependencies: Map<String, Any>? = null
 
   override fun <T : Any> getProvider(
     wantedType: KClass<*>,
@@ -89,7 +89,7 @@ class ComponentChild2_Component() : ComponentChild2, TestBaseComponent {
   override val originalType: KClass<*> = ComponentParent::class
   override val children: MutableSet<BaseComponent> = mutableSetOf()
   override val modules: Set<BaseModule> = setOf(Module3_Module(this))
-  override var runtimeDependencies: Map<String?, Any>? = null
+  override var runtimeDependencies: Map<String, Any>? = null
 
   override fun <T : Any> getProvider(
     wantedType: KClass<*>,

dependencies.gradle

@@ -2,8 +2,8 @@ ext.versions = [
     minSdk            : 19,
     compileSdk        : 29,
     buildTools        : '29.0.0',
-    publishVersion    : '0.5.0',
-    publishVersionCode: 11,
+    publishVersion    : '0.6.0',
+    publishVersionCode: 12,
 
     gradlePlugin      : '3.4.2',
     spotlessPlugin    : '3.24.0',

processor/src/main/kotlin/com/afollestad/ulfberht/components/ComponentBuilder.kt

@@ -275,11 +275,9 @@ internal class ComponentBuilder(
             """
             if ($PARENT_NAME != null && $CALLED_BY === $PARENT_NAME) return null
             val runtimeProvider = $GET_RUNTIME_DEP_NAME<%T>($QUALIFIER)
-                  ?.run { $FACTORY_EXTENSION_NAME { this } }
-            return runtimeProvider ?: $PARENT_NAME?.let {
-              it.$RUNTIME_DEPS_NAME = $RUNTIME_DEPS_NAME
-              it.$GET_PROVIDER_NAME<%T>($WANTED_TYPE, $GENERIC_ARGS, $QUALIFIER, $CALLED_BY)
-            }
+              ?.run { $FACTORY_EXTENSION_NAME { this } }
+            return runtimeProvider ?: $PARENT_NAME
+              ?.$GET_PROVIDER_NAME<%T>($WANTED_TYPE, $GENERIC_ARGS, $QUALIFIER, $CALLED_BY)
             """.trimIndent() + "\n",
             TYPE_VARIABLE_T,
             TYPE_VARIABLE_T

sample-android/src/main/kotlin/com/afollestad/ulfberhtsample/app/App.kt

@@ -25,13 +25,12 @@ class App : Application() {
 
   override fun onCreate() {
     super.onCreate()
+    if (DEBUG) {
+      Logger.install { Log.d("Ulfberht", it) }
+    }
 
     component<AppComponent>(
         AppContext::class to this
     ).inject(this)
-
-    if (DEBUG) {
-      Logger.install { Log.d("Ulfberht", it) }
-    }
   }
 }