CORDA-1265: Upgrade to Kotlin language/API 1.2 (#2871)

* Upgrade to Kotlin language/API 1.2
* Kotlin 1.2 annotates private Companion instances as "@Deprecated".
This commit is contained in:
Chris Rankin 2018-04-20 15:03:07 +01:00 committed by GitHub
parent 1c7def8e12
commit 342ecc4eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -3214,7 +3214,7 @@ public static final class net.corda.core.transactions.FilteredTransaction$Compan
@org.jetbrains.annotations.NotNull public final List inputsOfType(Class)
public String toString()
public final void verify()
public static final net.corda.core.transactions.LedgerTransaction$Companion Companion
@java.lang.Deprecated public static final net.corda.core.transactions.LedgerTransaction$Companion Companion
##
public static final class net.corda.core.transactions.LedgerTransaction$InOutGroup extends java.lang.Object
public <init>(List, List, Object)
@ -3320,7 +3320,7 @@ public static final class net.corda.core.transactions.NotaryChangeWireTransactio
@org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(java.security.KeyPair, net.corda.core.crypto.SignatureMetadata)
@org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(net.corda.core.crypto.TransactionSignature)
@org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable)
public static final net.corda.core.transactions.SignedTransaction$Companion Companion
@java.lang.Deprecated public static final net.corda.core.transactions.SignedTransaction$Companion Companion
##
@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash
public <init>(Set, List, net.corda.core.crypto.SecureHash)

View File

@ -165,8 +165,8 @@ allprojects {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
languageVersion = "1.1"
apiVersion = "1.1"
languageVersion = "1.2"
apiVersion = "1.2"
jvmTarget = "1.8"
javaParameters = true // Useful for reflection.
}