Release 0.81.0

- Breaking: Rename config util `plus` to `intoMap`
- Make `intoMap` more generic
- Add `intoList` util

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

buildSrc/src/main/kotlin/Config.kt

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.80.4"
+const val VERSION = "0.81.0"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

src/main/kotlin/com/salesforce/revoman/input/config/KickDef.kt

@@ -18,6 +18,7 @@ import com.squareup.moshi.JsonAdapter.Factory
 import io.vavr.control.Either
 import java.io.InputStream
 import java.lang.reflect.Type
+import java.util.AbstractMap.SimpleEntry
 import java.util.Collections.disjoint
 import org.immutables.value.Value
 import org.immutables.value.Value.Style.ImplementationVisibility.PUBLIC
@@ -99,8 +100,27 @@ internal interface KickDef {
   companion object {
     @JvmStatic
     @SafeVarargs
-    fun plus(vararg maps: Map<String, out Any?>): Map<String, Any?> =
-      maps.reduce { acc, map -> acc + map }
+    fun <K, V> intoMap(vararg items: Any): Map<K, V> where K : Any, V : Any? =
+      items
+        .flatMap { item ->
+          when (item) {
+            is Map<*, *> -> (item as Map<K, V>).entries
+            is Pair<*, *> -> listOf(SimpleEntry(item.first as K, item.second as V))
+            else ->
+              throw IllegalArgumentException("Expected Map<K,V> or Pair<K,V>, got ${item::class}")
+          }
+        }
+        .associate { it.key to it.value }
+
+    @JvmStatic
+    @SafeVarargs
+    fun <T> intoList(vararg items: Any): List<T> =
+      items.flatMap { item ->
+        when (item) {
+          is Collection<*> -> item.map { it as T }
+          else -> listOf(item as T)
+        }
+      }
   }
 }