From 0f4bb8a87c285e23bbc9aedacc3c9021333b0421 Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Tue, 24 Apr 2018 14:18:11 +0100
Subject: [PATCH] Upgrade to Kotlin 1.2 API. (#770)

---
 .../remote-attestation/attestation-challenger/build.gradle  | 2 +-
 sgx-jvm/remote-attestation/attestation-common/build.gradle  | 2 +-
 sgx-jvm/remote-attestation/attestation-host/build.gradle    | 2 +-
 sgx-jvm/remote-attestation/attestation-server/build.gradle  | 2 +-
 sgx-jvm/remote-attestation/build.gradle                     | 6 +++---
 sgx-jvm/remote-attestation/ias-proxy/build.gradle           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sgx-jvm/remote-attestation/attestation-challenger/build.gradle b/sgx-jvm/remote-attestation/attestation-challenger/build.gradle
index 2662a1a055..237bb860dc 100644
--- a/sgx-jvm/remote-attestation/attestation-challenger/build.gradle
+++ b/sgx-jvm/remote-attestation/attestation-challenger/build.gradle
@@ -38,7 +38,7 @@ mainClassName = 'net.corda.attestation.challenger.Main'
 
 dependencies {
     compile project(':attestation-common')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "junit:junit:$junit_version"
diff --git a/sgx-jvm/remote-attestation/attestation-common/build.gradle b/sgx-jvm/remote-attestation/attestation-common/build.gradle
index 822073ca4d..9a2eeb06f0 100644
--- a/sgx-jvm/remote-attestation/attestation-common/build.gradle
+++ b/sgx-jvm/remote-attestation/attestation-common/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin'
 description 'Common code shared between remote attestation modules'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "junit:junit:$junit_version"
diff --git a/sgx-jvm/remote-attestation/attestation-host/build.gradle b/sgx-jvm/remote-attestation/attestation-host/build.gradle
index 7ecd7c441d..c2c44cff5f 100644
--- a/sgx-jvm/remote-attestation/attestation-host/build.gradle
+++ b/sgx-jvm/remote-attestation/attestation-host/build.gradle
@@ -57,7 +57,7 @@ sourceSets {
 
 dependencies {
     compile project(':attestation-common')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "junit:junit:$junit_version"
diff --git a/sgx-jvm/remote-attestation/attestation-server/build.gradle b/sgx-jvm/remote-attestation/attestation-server/build.gradle
index 84a0664d33..60c0602694 100644
--- a/sgx-jvm/remote-attestation/attestation-server/build.gradle
+++ b/sgx-jvm/remote-attestation/attestation-server/build.gradle
@@ -49,7 +49,7 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "junit:junit:$junit_version"
diff --git a/sgx-jvm/remote-attestation/build.gradle b/sgx-jvm/remote-attestation/build.gradle
index 9ce9ae1d63..0a09aca7b7 100644
--- a/sgx-jvm/remote-attestation/build.gradle
+++ b/sgx-jvm/remote-attestation/build.gradle
@@ -47,8 +47,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 allprojects {
     tasks.withType(KotlinCompile).all {
         kotlinOptions {
-            languageVersion = "1.1"
-            apiVersion = "1.1"
+            languageVersion = "1.2"
+            apiVersion = "1.2"
             jvmTarget = "1.8"
             javaParameters = true   // Useful for reflection.
         }
@@ -81,5 +81,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = "4.3.1"
+    gradleVersion = "4.7"
 }
diff --git a/sgx-jvm/remote-attestation/ias-proxy/build.gradle b/sgx-jvm/remote-attestation/ias-proxy/build.gradle
index 55253a6fba..646067b56d 100644
--- a/sgx-jvm/remote-attestation/ias-proxy/build.gradle
+++ b/sgx-jvm/remote-attestation/ias-proxy/build.gradle
@@ -39,7 +39,7 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testCompile "junit:junit:$junit_version"