Upgrade to Koltin 1.7.0
- Also update to Gradle 7.5-rc-2 that properly supports Kotlin
Gradle Plugin 1.7.0 otherwise signature validation fails
Test: ./gradlew
Change-Id: I076293b6540663fb00bb3df388980124ccc31e09
diff --git a/build.gradle.kts b/build.gradle.kts
index 33aa822..af567fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -53,9 +53,6 @@
}
tasks.withType(KotlinCompile::class.java) {
- sourceCompatibility = "11"
- targetCompatibility = "11"
-
kotlinOptions {
jvmTarget = "11"
apiVersion = "1.6"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 00069ce..cb951ba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-kotlin = "1.6.20"
+kotlin = "1.7.0"
[libraries]
kotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a40eddc..cd9eb37 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -77,7 +77,10 @@
<trusting group="com.sun.activation"/>
<trusting group="jakarta.activation"/>
</trusted-key>
- <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
+ <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83">
+ <trusting group="org.jetbrains.kotlin"/>
+ <trusting group="org.jetbrains.kotlin.jvm"/>
+ </trusted-key>
<trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
<trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs"/>
<trusted-key id="79752db6c966f0b8" group="com.google.android"/>
@@ -115,6 +118,7 @@
<trusted-key id="c51e6cbc7ff46f0b" group="com.google.auto"/>
<trusted-key id="c70b844f002f21f6d2b9c87522e44ac0622b91c3" group="com.beust"/>
<trusted-key id="c727d053c4481cf5" group="org.tensorflow"/>
+ <trusted-key id="c7be5bcc9fec15518cfda882b0f3710fa64900e7" group="com.google.code.gson"/>
<trusted-key id="c7cb325467893cc4" group="junit"/>
<trusted-key id="c9fbaa83a8753994">
<trusting group="com.fasterxml.jackson.core"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a49e9c4..b7210a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-2-bin.zip
