This is an automated email from the ASF dual-hosted git repository.
jiayuliu pushed a commit to branch fix-kotlin-format
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/fix-kotlin-format by this push:
new c0caad213 fix gradle format
c0caad213 is described below
commit c0caad213f19ee9d39f51d69f5332a94b76b2bad
Author: Jiayu Liu <[email protected]>
AuthorDate: Wed Jul 5 08:32:55 2023 +0000
fix gradle format
---
lib/kotlin/build.gradle.kts | 4 ++--
lib/kotlin/cross-test-client/build.gradle.kts | 2 +-
lib/kotlin/settings.gradle.kts | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/kotlin/build.gradle.kts b/lib/kotlin/build.gradle.kts
index cd52e7fce..754df89fc 100644
--- a/lib/kotlin/build.gradle.kts
+++ b/lib/kotlin/build.gradle.kts
@@ -40,7 +40,7 @@ kotlin {
}
}
-tasks.withType<KotlinCompile> {
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
@@ -57,7 +57,7 @@ tasks {
task<Exec>("compileThrift") {
val thriftBin = if (hasProperty("thrift.compiler")) {
- file(property("thrift.compiler"))
+ file(property("thrift.compiler")!!)
} else {
project.rootDir.resolve("../../compiler/cpp/thrift")
}
diff --git a/lib/kotlin/cross-test-client/build.gradle.kts
b/lib/kotlin/cross-test-client/build.gradle.kts
index 579d01e4c..b370a403c 100644
--- a/lib/kotlin/cross-test-client/build.gradle.kts
+++ b/lib/kotlin/cross-test-client/build.gradle.kts
@@ -70,7 +70,7 @@ tasks {
task<Exec>("compileThrift") {
val thriftBin = if (hasProperty("thrift.compiler")) {
- file(property("thrift.compiler"))
+ file(property("thrift.compiler")!!)
} else {
project.rootDir.resolve("../../compiler/cpp/thrift")
}
diff --git a/lib/kotlin/settings.gradle.kts b/lib/kotlin/settings.gradle.kts
index 342fc3b1d..86fa02ada 100644
--- a/lib/kotlin/settings.gradle.kts
+++ b/lib/kotlin/settings.gradle.kts
@@ -18,7 +18,7 @@
*/
pluginManagement {
plugins {
- kotlin("jvm") version "1.8.21"
+ kotlin("jvm") version "1.8.22"
id("com.ncorti.ktfmt.gradle") version "0.12.0"
}
}