Gradle 8.5 support

core/build.gradle

@@ -57,9 +57,9 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 artifacts {
     archives sourcesJar
-}	
+}

core/src/main/java/com/flipkart/gjex/core/service/AbstractService.java

@@ -55,6 +55,13 @@ public final void start() throws Exception {
 				setStarting();
 				doStart();
 				setStarted();
+				AbstractService self = this;
+				Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                    // Use stderr here since the logger may have been reset by its JVM shutdown hook.
+                    System.err.println("*** shutting down since JVM is shutting down");
+                    self.stop();
+                    System.err.println("*** server shut down");
+                }));
 			} catch (Throwable e) {
 				setFailed(e);
 				throw e;

examples/build.gradle

@@ -21,12 +21,18 @@ repositories {
 def jexpressVersion = '1.39-SNAPSHOT'
 def grpcVersion = '1.38.0'
 def protobufVersion = '3.12.0'
-def protocVersion = protobufVersion
+def protocVersion = protobufVersion+":osx-x86_64"
 
 dependencies {
-    implementation "com.flipkart.grpc-jexpress:core:${jexpressVersion}"
-    implementation "com.flipkart.grpc-jexpress:runtime:${jexpressVersion}"
-    implementation "com.flipkart.grpc-jexpress:guice:${jexpressVersion}"
+//    implementation "com.flipkart.grpc-jexpress:core:${jexpressVersion}"
+//    implementation "com.flipkart.grpc-jexpress:runtime:${jexpressVersion}"
+//    implementation "com.flipkart.grpc-jexpress:guice:${jexpressVersion}"
+
+    implementation project(':core')
+    implementation project(':runtime')
+    implementation project(':guice')
+
+
     implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
     implementation "io.grpc:grpc-protobuf:${grpcVersion}"
     implementation "io.grpc:grpc-stub:${grpcVersion}"
@@ -74,6 +80,15 @@ task helloWorldServer(type: CreateStartScripts) {
     classpath = startScripts.classpath
 }
 
+task runHelloWorldServer(type: JavaExec) {
+    group = "Execution"
+    description = "run hello-world-server"
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'com.flipkart.gjex.examples.helloworld.HelloWorldApplication'
+    args "server", "./src/main/resources/hello_world_config.yml"
+    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+}
+
 
 task helloWorldClient(type: CreateStartScripts) {
     mainClassName = 'com.flipkart.gjex.examples.helloworld.client.HelloWorldClient'
@@ -82,6 +97,14 @@ task helloWorldClient(type: CreateStartScripts) {
     classpath = startScripts.classpath
 }
 
+task runHelloWorldClient(type: JavaExec) {
+    group = "Execution"
+    description = "run hello-world-client"
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'com.flipkart.gjex.examples.helloworld.client.HelloWorldClient'
+    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+}
+
 applicationDistribution.into('bin') {
     from(helloWorldServer)
     from(helloWorldClient)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

guice/build.gradle

@@ -60,7 +60,7 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 artifacts {

runtime/build.gradle

@@ -39,7 +39,7 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 artifacts {