From 148b7b75519a1c1d4a05b71f2a114bb11ba9413d Mon Sep 17 00:00:00 2001
From: Clinton <clintonxa@gmail.com>
Date: Mon, 27 Mar 2017 17:53:58 +0100
Subject: [PATCH] Upgraded Kotlin version to 1.1.1 to fix issues with Cordapp
 building. (#439)

---
 build.gradle                                                    | 2 +-
 .../kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ffc6109037..71ade98de1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     // Dependency versions. Can run 'gradle dependencyUpdates' to find new versions of things.
     //
     // TODO: Sort this alphabetically.
-    ext.kotlin_version = '1.0.7'
+    ext.kotlin_version = '1.1.1'
     ext.quasar_version = '0.7.6'    // TODO: Upgrade to 0.7.7+ when Quasar bug 238 is resolved.
     ext.asm_version = '0.5.3'
     ext.artemis_version = '1.5.3'
diff --git a/test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt b/test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
index 16a125dad6..bee1c16cbe 100644
--- a/test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
+++ b/test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
@@ -222,7 +222,7 @@ class InMemoryMessagingNetwork(
             override fun <A> pickNext(service: ServiceHandle, pickFrom: List<A>): A {
                 val nextIndex = previousPicks.compute(service) { _key, previous ->
                     (previous?.plus(1) ?: 0) % pickFrom.size
-                }
+                }!!
                 return pickFrom[nextIndex]
             }
         }