ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2876: Add explicit Kotlin dependencies to DJVM serialization modules. (#5678)

Browse Source 
* 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.
This commit is contained in:
Chris Rankin 2019-11-06 16:49:27 +00:00 committed by Matthew Nesbit
parent a88ee7d138
commit 7708a3c28a
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.properties
View File

@ -10,7 +10,7 @@ java8MinUpdateVersion=171
# When incrementing platformVersion make sure to update # # When incrementing platformVersion make sure to update #
# net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. # # net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. #
# ***************************************************************# # ***************************************************************#
platformVersion=5 platformVersion=6
guavaVersion=28.0-jre guavaVersion=28.0-jre
# Quasar version to use with Java 8: # Quasar version to use with Java 8:
quasarVersion=0.7.12_r3 quasarVersion=0.7.12_r3

2
core-deterministic/build.gradle
View File

@ -30,13 +30,13 @@ dependencies {
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
api "javax.persistence:javax.persistence-api:2.2" api "javax.persistence:javax.persistence-api:2.2"
api "com.google.code.findbugs:jsr305:$jsr305_version" 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. // These dependencies will become "runtime" scoped in our published POM.
// See publish.dependenciesFrom.defaultScope. // See publish.dependenciesFrom.defaultScope.
deterministicLibraries "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version" deterministicLibraries "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version"
deterministicLibraries "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version" deterministicLibraries "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version"
deterministicLibraries "net.i2p.crypto:eddsa:$eddsa_version" deterministicLibraries "net.i2p.crypto:eddsa:$eddsa_version"
deterministicLibraries "org.slf4j:slf4j-api:$slf4j_version"
} }
jar { jar {

2
core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
View File

@ -25,7 +25,7 @@ import java.util.jar.JarInputStream
// *Internal* Corda-specific utilities. // *Internal* Corda-specific utilities.
const val PLATFORM_VERSION = 5 const val PLATFORM_VERSION = 6
fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) { fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) {
checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature) checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature)

2
serialization-djvm/build.gradle
View File

@ -20,6 +20,8 @@ dependencies {
api project(':core') api project(':core')
api project(':serialization') api project(':serialization')
api "net.corda.djvm:corda-djvm:$djvm_version" 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')) { implementation(project(':serialization-djvm:deserializers')) {
transitive = false transitive = false
} }

1
serialization-djvm/deserializers/build.gradle
View File

@ -12,6 +12,7 @@ description 'Deserializers for the DJVM'
dependencies { dependencies {
api project(path: ':core-deterministic', configuration: 'deterministicArtifacts') api project(path: ':core-deterministic', configuration: 'deterministicArtifacts')
api project(path: ':serialization-deterministic', configuration: 'deterministicArtifacts') api project(path: ':serialization-deterministic', configuration: 'deterministicArtifacts')
api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
} }
jar { jar {