fix: Defaults are not applied

Closes: #107
RedMadRobot · Jun 17, 2022 · b423378 · b423378
1 parent a65c277
commit b423378
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+### Fixed
+
+- Defaults from parent project are not applied to project (#107)
+
 ## [0.16.1] (2022-06-17)
 
 ### Added

diff --git a/infrastructure-common/src/main/kotlin/WithDefaults.kt b/infrastructure-common/src/main/kotlin/WithDefaults.kt
@@ -20,6 +20,10 @@ internal inline fun <reified T : WithDefaults<T>> ExtensionContainer.createWithD
     defaults: T?,
     publicType: KClass<in T>? = null,
 ): T {
-    return if (publicType == null) create(name) else (create(publicType, name, T::class) as T)
-        .apply { if (defaults != null) setDefaults(defaults) }
+    val extension = if (publicType == null) {
+        create(name)
+    } else {
+        create(publicType, name, T::class) as T
+    }
+    return extension.apply { if (defaults != null) setDefaults(defaults) }
 }