Replace deprecated Gradle features

Author: KodaiD

microservice-transaction-sample/client/build.gradle

@@ -10,10 +10,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.client.Client'
+    mainClass = 'sample.client.Client'
 }
 
-archivesBaseName = "sample-order-service"
+base {
+    archivesName = "sample-order-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/customer-service/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.customer.CustomerServiceServer'
+    mainClass = 'sample.customer.CustomerServiceServer'
 }
 
 task copyFilesToDockerBuildContextDir(type: Copy) {
@@ -47,7 +47,12 @@ installDist {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
 
-archivesBaseName = "sample-customer-service"
+base {
+    archivesName = "sample-customer-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/order-service/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.order.OrderServiceServer'
+    mainClass = 'sample.order.OrderServiceServer'
 }
 
 task copyFilesToDockerBuildContextDir(type: Copy) {
@@ -47,7 +47,12 @@ installDist {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
 
-archivesBaseName = "sample-order-service"
+base {
+    archivesName = "sample-order-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/rpc/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'java-library-distribution'
-    id 'com.google.protobuf' version '0.9.1'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 dependencies {
@@ -20,16 +20,40 @@ protobuf {
     generateProtoTasks {
         all()*.plugins { grpc {} }
     }
-    generatedFilesBaseDir = "$projectDir/src"
 }
 
-archivesBaseName = "sample-rpc"
+base {
+    archivesName = "sample-rpc"
+}
+
+// Task copyGeneratedProtoToSrc copies the generated .java files into src directory
+task copyGeneratedProtoToSrc(type: Copy) {
+    description 'Copies generated Protocol Buffer classes to src/main/java/sample/rpc'
+    dependsOn generateProto
+    from "$buildDir/generated/source/proto/main/java/sample/rpc"
+    into "$projectDir/src/main/java/sample/rpc"
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+// Task deleteBuildMainJava deletes the generated .java files in build directory
+task deleteBuildMainJava(type: Delete) {
+    dependsOn copyGeneratedProtoToSrc
+    delete fileTree(dir: "$buildDir/generated/source/proto/main/java/sample/rpc")
+}
 
 // The processResources task needs to depend on the generateProto task because it uses the output
 // of the the generateProto task
 processResources {
     dependsOn generateProto
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+// Task deleteBuildMainJava needs to depend on deleteBuildMainJava to avoid duplicate class error
+tasks.named("compileJava").configure {
+    dependsOn deleteBuildMainJava
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

multi-storage-transaction-sample/build.gradle

@@ -16,10 +16,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.command.SampleCommand'
+    mainClass = 'sample.command.SampleCommand'
 }
 
-archivesBaseName = "sample"
+base {
+    archivesName = "sample"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

scalardb-kotlin-sample/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.21"
+    kotlin("jvm") version "2.0.21"
     application
 }
 
@@ -21,13 +21,8 @@ tasks.test {
     useJUnitPlatform()
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+kotlin {
+    jvmToolchain(8)
 }
 
 application {

scalardb-sample/build.gradle

@@ -16,10 +16,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.command.SampleCommand'
+    mainClass = 'sample.command.SampleCommand'
 }
 
-archivesBaseName = "sample"
+base {
+    archivesName = "sample"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

scalardb-sql-jdbc-sample/build.gradle

@@ -17,10 +17,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.command.SampleCommand'
+    mainClass = 'sample.command.SampleCommand'
 }
 
-archivesBaseName = "sample"
+base {
+    archivesName = "sample"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

spring-data-microservice-transaction-sample/client/build.gradle

@@ -10,10 +10,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.client.Client'
+    mainClass = 'sample.client.Client'
 }
 
-archivesBaseName = "sample-order-service"
+base {
+    archivesName = "sample-order-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

spring-data-microservice-transaction-sample/customer-service/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.customer.CustomerServiceServer'
+    mainClass = 'sample.customer.CustomerServiceServer'
 }
 
 task copyFilesToDockerBuildContextDir(type: Copy) {
@@ -49,7 +49,12 @@ installDist {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
 
-archivesBaseName = "sample-customer-service"
+base {
+    archivesName = "sample-customer-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}