Upgrada kotlin to m13

Change-Id: Iec30be0e153f7354d4909970be4292fcf11988bf

3 files changed, 18 insertions, 18 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 e1ceb3b8..fbba6554 100644
--- a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt
+++ b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt
@@ -63,7 +63,7 @@ class KCode (private val s : String? = null){
     }
 
     private fun tab(c : KCode?) : KCode {
-        if (isNull(c)) {
+        if (c == null || isNull(c)) {
             return this
         }
         nodes.add(c)
@@ -81,7 +81,7 @@ class KCode (private val s : String? = null){
     }
 
     fun nl(c : KCode?) : KCode {
-        if (isNull(c)) {
+        if (c == null || isNull(c)) {
             return this
         }
         nodes.add(c)
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 55b858e0..3e11a58a 100644
--- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt
+++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt
@@ -66,11 +66,11 @@ class ExprModelExt {
         }
         var candidate = candidateBase
         var i = 0
-        while (usedFieldNames[scope].contains(candidate)) {
+        while (usedFieldNames[scope]!!.contains(candidate)) {
             i ++
             candidate = candidateBase + i
         }
-        usedFieldNames[scope].add(candidate)
+        usedFieldNames[scope]!!.add(candidate)
         return candidate
     }
 }
@@ -368,17 +368,17 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
                     val index = indices.get(it)
                     tab("sIncludes.setIncludes(${index}, ") {
                         tab ("new String[] {${
-                        includeMap.get(it).map {
+                        includeMap.get(it)!!.map {
                             "\"${it.getIncludedLayout()}\""
                         }.joinToString(", ")
                         }},")
                         tab("new int[] {${
-                        includeMap.get(it).map {
+                        includeMap.get(it)!!.map {
                             "${indices.get(it)}"
                         }.joinToString(", ")
                         }},")
                         tab("new int[] {${
-                        includeMap.get(it).map {
+                        includeMap.get(it)!!.map {
                             "R.layout.${it.getIncludedLayout()}"
                         }.joinToString(", ")
                         }});")
diff --git a/compiler/src/main/resources/NOTICE.txt b/compiler/src/main/resources/NOTICE.txt
index 7d851ea4..7f291e71 100644
--- a/compiler/src/main/resources/NOTICE.txt
+++ b/compiler/src/main/resources/NOTICE.txt
@@ -1,6 +1,6 @@
 List of 3rd party licenses:
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@3e7607b6 name:antlr4 classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@bc87583 name:antlr4 classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -34,7 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@7f8915e2 name:commons-io classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@403eac04 name:commons-io classifier:null extension:jar type:jar]
 
  ****** NOTICE:
 Apache Commons IO
@@ -252,7 +252,7 @@ The Apache Software Foundation (http://www.apache.org/).
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@6698ee3c name:antlr4-annotations classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@6510dae2 name:antlr4-annotations classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -286,7 +286,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@71642838 name:kotlin-stdlib classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@109f0701 name:kotlin-stdlib classifier:null extension:jar type:jar]
 
  ****** NOTICE:
    =========================================================================
@@ -523,7 +523,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@5ac787b0 name:kotlin-runtime classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@13257102 name:kotlin-runtime classifier:null extension:jar type:jar]
 
  ****** NOTICE:
    =========================================================================
@@ -760,7 +760,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@28712258 name:commons-codec classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@30c9fa2b name:commons-codec classifier:null extension:jar type:jar]
 
  ****** NOTICE:
 Apache Commons Codec
@@ -989,7 +989,7 @@ Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@220e3cec name:antlr-runtime classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@4ebc8a76 name:antlr-runtime classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -1023,7 +1023,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@2c1af6aa name:org.abego.treelayout.core classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@220ea65 name:org.abego.treelayout.core classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -1058,7 +1058,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@a8ffb40 name:antlr4-runtime classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@18266395 name:antlr4-runtime classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -1092,7 +1092,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@64186e7b name:ST4 classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@45416889 name:ST4 classifier:null extension:jar type:jar]
 
  ****** LICENSE:
 [The "BSD license"]
@@ -1126,7 +1126,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 -----------------------------------------------------------------------------
-* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@531f73a0 name:commons-lang3 classifier:null extension:jar type:jar]
+* [ResolvedArtifact dependency:org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion@7dc45da5 name:commons-lang3 classifier:null extension:jar type:jar]
 
  ****** NOTICE:
 Apache Commons Lang