ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-12 07:52:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.2 API. (#770)

Browse Source
This commit is contained in:
Chris Rankin 2018-04-24 14:18:11 +01:00 committed by GitHub
parent bb4dab7451
commit 0f4bb8a87c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgx-jvm/remote-attestation/attestation-challenger/build.gradle
View File

@ -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"

2
sgx-jvm/remote-attestation/attestation-common/build.gradle
View File

@ -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"

2
sgx-jvm/remote-attestation/attestation-host/build.gradle
View File

@ -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"

2
sgx-jvm/remote-attestation/attestation-server/build.gradle
View File

@ -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"

6
sgx-jvm/remote-attestation/build.gradle
View File

@ -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"
}

2
sgx-jvm/remote-attestation/ias-proxy/build.gradle
View File

@ -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"