diff options
| author | Tor Norbye <tnorbye@google.com> | 2016-01-20 10:55:56 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2016-01-20 10:55:56 -0800 |
| commit | 39113ca579a3d4e1c24e204f102e6dc9b26125af (patch) | |
| tree | de5312393fa824485fb4f28a4be1c9dfb312e43c /compiler/src/main | |
| parent | b91ce25d417ffd3725252c94b256991f2cd86cec (diff) | |
| download | data-binding-39113ca579a3d4e1c24e204f102e6dc9b26125af.tar.gz | |
Update Kotlin code to be beta 4 compatible
Change-Id: I96ab85fd9ec3d857929055b804fd094a4e3d245c
Diffstat (limited to 'compiler/src/main')
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt | 4 | ||||
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt index f991d405..906880a0 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt @@ -81,7 +81,7 @@ class KCode (private val s : String? = null){ return this } - fun nl(c : KCode?) : KCode { + infix fun nl(c : KCode?) : KCode { if (c == null || isNull(c)) { return this } @@ -90,7 +90,7 @@ class KCode (private val s : String? = null){ return this } - fun nl(s : String?, init : (KCode.() -> Unit)? = null) : KCode { + infix fun nl(s : String?, init : (KCode.() -> Unit)? = null) : KCode { val c = KCode(s) if (init != null) { c.init() diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt index e52daf3c..324c2e9c 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt @@ -49,7 +49,7 @@ enum class Scope { class ExprModelExt { val usedFieldNames = hashMapOf<Scope, MutableSet<String>>(); init { - Scope.values.forEach { usedFieldNames[it] = hashSetOf<String>() } + Scope.values().forEach { usedFieldNames[it] = hashSetOf<String>() } } val localizedFlags = arrayListOf<FlagSet>() |