Separate feature branch for gradle+kotlin enhancment

Author: ethaden

.gitignore

@@ -1,2 +1,6 @@
 */Kafka*/build/*
 !*/Kafka*/build/generated*/
+*/Kafka*/.gradle
+*/Kafka*/.java-version
+api-key*.txt
+client.properties

client.properties-template

@@ -0,0 +1,16 @@
+security.protocol=SASL_SSL
+sasl.mechanism=PLAIN
+sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username='<Username or API-KEY>' password='<Password or API-SECRET>';
+bootstrap.servers=<hostname>:<port>
+group.id=<Name of your consumer group>
+# Schema Registry
+schema.registry.url=<URL OF SCHEMA REGISTRY>
+basic.auth.credentials.source=USER_INFO
+basic.auth.user.info=<user>:<password>
+use.latest.version=true
+auto.register.schemas=false
+# Encryption
+rule.executors._default_.param.token.id=<root-token>
+# Topic configuration
+topic.name=csfle-test
+

hashicorp/KafkaConsumer/build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.7.20"
     id("com.github.davidmc24.gradle.plugin.avro") version "1.2.0"
     application
 }
@@ -31,21 +31,23 @@ dependencies {
     implementation("io.confluent:kafka-schema-registry-client-encryption-hcvault:7.4.2")
 }
 
-val fatJar = task("fatJar", type = Jar::class) {
-
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    baseName = "fatApp"
-    manifest {
-        attributes["Main-Class"] = application.mainClass
+tasks {
+    val fatJar = register<Jar>("fatJar") {
+        dependsOn.addAll(listOf("compileJava", "compileKotlin", "processResources")) // We need this for Gradle optimization to work
+        archiveClassifier.set("standalone") // Naming the jar
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        manifest { attributes(mapOf("Main-Class" to application.mainClass)) } // Provided we set it up in the application plugin configuration
+        val sourcesMain = sourceSets.main.get()
+        val contents = configurations.runtimeClasspath.get()
+            .map { if (it.isDirectory) it else zipTree(it) } +
+                sourcesMain.output
+        from(contents)
+    }
+    build {
+        dependsOn(fatJar) // Trigger fat jar creation during build
     }
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }

hashicorp/KafkaConsumer/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists