From 18f81ba97356911a47fbcab8a4bc03af80cf02e3 Mon Sep 17 00:00:00 2001
From: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
Date: Tue, 20 Feb 2018 13:25:34 +0000
Subject: [PATCH] Eliminate references to Java target "1.6"

Also for "client/rpc" explicitly specify "jvmTarget" (similar to what "experimental/behave" does) to avoid ambiguity.

Without this change the following compilation error been observed in IntelliJ:
Z:\corda\experimental\behave\src\main\kotlin\net\corda\behave\node\Node.kt
Error:(163, 44) Kotlin: Cannot inline bytecode built with JVM target 1.8 into bytecode that is being built with JVM target 1.6. Please specify proper '-jvm-target' option
---
 .idea/compiler.xml      | 4 ++--
 client/rpc/build.gradle | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index afbe5b7416..de96a0c9a6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -156,8 +156,8 @@
       <module name="web_test" target="1.8" />
       <module name="webcapsule_main" target="1.6" />
       <module name="webcapsule_test" target="1.6" />
-      <module name="webserver-webcapsule_main" target="1.6" />
-      <module name="webserver-webcapsule_test" target="1.6" />
+      <module name="webserver-webcapsule_main" target="1.8" />
+      <module name="webserver-webcapsule_test" target="1.8" />
       <module name="webserver_integrationTest" target="1.8" />
       <module name="webserver_main" target="1.8" />
       <module name="webserver_test" target="1.8" />
diff --git a/client/rpc/build.gradle b/client/rpc/build.gradle
index bd234e8ee1..3b585cf164 100644
--- a/client/rpc/build.gradle
+++ b/client/rpc/build.gradle
@@ -15,6 +15,14 @@ configurations {
     smokeTestRuntime.extendsFrom runtime
 }
 
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 sourceSets {
     integrationTest {
         kotlin {