From 7708a3c28afbc5dee1a1ef570d7fc5c0363c5b3c Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Wed, 6 Nov 2019 16:49:27 +0000
Subject: [PATCH] CORDA-2876: Add explicit Kotlin dependencies to DJVM
 serialization modules. (#5678)

* CORDA-2876: Add explicit Kotlin dependencies to DJVM serialization modules.

* Publish slf4j-api at compile scope for corda-core-deterministic.

* Bump Corda platform version to 6.
---
 constants.properties                                       | 2 +-
 core-deterministic/build.gradle                            | 2 +-
 core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt | 2 +-
 serialization-djvm/build.gradle                            | 2 ++
 serialization-djvm/deserializers/build.gradle              | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/constants.properties b/constants.properties
index c743f1fb05..696cfa0254 100644
--- a/constants.properties
+++ b/constants.properties
@@ -10,7 +10,7 @@ java8MinUpdateVersion=171
 # When incrementing platformVersion make sure to update          #
 # net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. #
 # ***************************************************************#
-platformVersion=5
+platformVersion=6
 guavaVersion=28.0-jre
 # Quasar version to use with Java 8:
 quasarVersion=0.7.12_r3
diff --git a/core-deterministic/build.gradle b/core-deterministic/build.gradle
index c1f65ebfa0..45b4b88816 100644
--- a/core-deterministic/build.gradle
+++ b/core-deterministic/build.gradle
@@ -30,13 +30,13 @@ dependencies {
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     api "javax.persistence:javax.persistence-api:2.2"
     api "com.google.code.findbugs:jsr305:$jsr305_version"
+    api "org.slf4j:slf4j-api:$slf4j_version"
 
     // These dependencies will become "runtime" scoped in our published POM.
     // See publish.dependenciesFrom.defaultScope.
     deterministicLibraries "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version"
     deterministicLibraries "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version"
     deterministicLibraries "net.i2p.crypto:eddsa:$eddsa_version"
-    deterministicLibraries "org.slf4j:slf4j-api:$slf4j_version"
 }
 
 jar {
diff --git a/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt b/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
index 182629d85b..36efcbcf05 100644
--- a/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
+++ b/core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
@@ -25,7 +25,7 @@ import java.util.jar.JarInputStream
 
 // *Internal* Corda-specific utilities.
 
-const val PLATFORM_VERSION = 5
+const val PLATFORM_VERSION = 6
 
 fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) {
     checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature)
diff --git a/serialization-djvm/build.gradle b/serialization-djvm/build.gradle
index b85e003547..2fe76ad914 100644
--- a/serialization-djvm/build.gradle
+++ b/serialization-djvm/build.gradle
@@ -20,6 +20,8 @@ dependencies {
     api project(':core')
     api project(':serialization')
     api "net.corda.djvm:corda-djvm:$djvm_version"
+    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation(project(':serialization-djvm:deserializers')) {
         transitive = false
     }
diff --git a/serialization-djvm/deserializers/build.gradle b/serialization-djvm/deserializers/build.gradle
index 5676207fd1..8c19a9c351 100644
--- a/serialization-djvm/deserializers/build.gradle
+++ b/serialization-djvm/deserializers/build.gradle
@@ -12,6 +12,7 @@ description 'Deserializers for the DJVM'
 dependencies {
     api project(path: ':core-deterministic', configuration: 'deterministicArtifacts')
     api project(path: ':serialization-deterministic', configuration: 'deterministicArtifacts')
+    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 }
 
 jar {