neat kotlin

Author: feuyeux

Diff for: docker/kotlin_build.sh

@@ -6,8 +6,26 @@ cd "$(
   pwd -P
 )/" || exit
 
+# if os is windows, echo ok, otherwise echo alert.
+if [ "$(uname)" == "Darwin" ]; then
+  echo "macOS detected"
+elif [ "$(expr substr "$(uname -s)" 1 5)" == "Linux" ]; then
+  echo "Linux detected"
+else
+  export JAVA_HOME_8=/d/zoo/java-se-8u44/
+  export JAVA_HOME_11=/d/zoo/jdk-11.0.23/
+  export JAVA_HOME_21=/d/zoo/jdk-21.0.3/
+  export JAVA_HOME_23=/d/zoo/jdk-23/
+fi
+# if the first input parameter is empty, use JAVA_HOME_21, otherwise use it.
+if [ -z "$1" ]; then
+  export JAVA_HOME=$JAVA_HOME_21
+else
+  export JAVA_HOME="JAVA_HOME_$1"
+fi
+echo "JAVA_HOME=$JAVA_HOME"
 gradle --version
-
+#
 echo "~~~ build grpc server kotlin ~~~"
 cd ../hello-grpc-kotlin
 cd server

Diff for: hello-grpc-kotlin/README.md

@@ -2,6 +2,7 @@
 
 ```bash
 # brew install gradle
+gradle -v | grep JVM
 gradle clean installDist --warning-mode all
 gradle :server:ProtoServer
 gradle :client:ProtoClient

Diff for: hello-grpc-kotlin/build.gradle.kts

@@ -8,17 +8,26 @@ plugins {
 
 //https://github.com/grpc/grpc/releases
 //https://mvnrepository.com/artifact/io.grpc/grpc-netty
-ext["grpcVersion"] = "1.61.0"
+ext["grpcVersion"] = "1.68.0"
+//https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
+ext["kotlinxVersion"] = "1.9.0"
 //https://github.com/grpc/grpc-kotlin
+//https://mvnrepository.com/artifact/io.grpc/grpc-kotlin-stub
+//https://mvnrepository.com/artifact/io.grpc/protoc-gen-grpc-kotlin
 ext["grpcKotlinVersion"] = "1.4.1"
 //https://github.com/protocolbuffers/protobuf/releases
 //https://mvnrepository.com/artifact/com.google.protobuf/protobuf-kotlin
-ext["protobufVersion"] = "3.25.3"
+ext["protobufVersion"] = "4.28.2"
+//https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util
+ext["protobufJavaUtilVersion"] = "4.28.2"
 //https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-ext["log4jVersion"] = "2.23.0"
+ext["log4jVersion"] = "2.24.0"
+//https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api-kotlin
+ext["log4jKotlinVersion"] = "1.5.0"
 //https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
 ext["jacksonVersion"] = "2.16.1"
 
+
 allprojects {
     repositories {
         maven {

Diff for: hello-grpc-kotlin/client/build.gradle.kts

@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     application
@@ -14,6 +13,7 @@ application {
 
 dependencies {
     implementation(project(":stub"))
+    implementation("org.jetbrains.kotlin:kotlin-reflect:${rootProject.ext["kotlinxVersion"]}")
     runtimeOnly("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
 }
 

Diff for: hello-grpc-kotlin/doc/windows_jdk.md

@@ -0,0 +1,11 @@
+# Windows JAVA_HOME
+
+```sh
+export JAVA_HOME_8=/d/zoo/java-se-8u44/
+export JAVA_HOME_11=/d/zoo/jdk-11.0.23/
+export JAVA_HOME_21=/d/zoo/jdk-21.0.3/
+export JAVA_HOME_23=/d/zoo/jdk-23/
+
+export JAVA_HOME=$JAVA_HOME_21
+echo $JAVA_HOME
+```

Diff for: hello-grpc-kotlin/stub/build.gradle.kts

@@ -12,25 +12,20 @@ dependencies {
     protobuf(project(":protos"))
     implementation("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
     api(kotlin("stdlib"))
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3-native-mt")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext["kotlinxVersion"]}")
     api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
     api("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}")
-    api("com.google.protobuf:protobuf-java-util:4.28.2")
-    api("io.grpc:grpc-kotlin-stub:1.4.1")
-    api("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
+    api("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufJavaUtilVersion"]}")
+    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
+    api("org.apache.logging.log4j:log4j-api-kotlin:${rootProject.ext["log4jKotlinVersion"]}")
     api("org.apache.logging.log4j:log4j-api:${rootProject.ext["log4jVersion"]}")
     api("org.apache.logging.log4j:log4j-core:${rootProject.ext["log4jVersion"]}")
     api("com.fasterxml.jackson.core:jackson-databind:${rootProject.ext["jacksonVersion"]}")
     api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${rootProject.ext["jacksonVersion"]}")
     testImplementation(kotlin("test"))
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_16
-}
-
 protobuf {
-    generatedFilesBaseDir = "$projectDir/src/generated"
     protoc {
         artifact = "com.google.protobuf:protoc:${rootProject.ext["protobufVersion"]}"
     }
@@ -39,6 +34,7 @@ protobuf {
             artifact = "io.grpc:protoc-gen-grpc-java:${rootProject.ext["grpcVersion"]}"
         }
         id("grpckt") {
+            // https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-kotlin/
             artifact = "io.grpc:protoc-gen-grpc-kotlin:${rootProject.ext["grpcKotlinVersion"]}:jdk8@jar"
         }
     }
@@ -52,10 +48,15 @@ protobuf {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "16"
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+    }
+}
 tasks.test {
     useJUnitPlatform()
 }

Diff for: hello-grpc-kotlin/stub/src/main/kotlin/org/feuyeux/grpc/Utils.kt

@@ -1,4 +1,4 @@
-package org.feuyeux.grpc;
+package org.feuyeux.grpc
 
 import java.util.Map