Merge remote-tracking branch 'origin/master' into dev-2024

* origin/master: Support for Java 21 & Gradle 8.5 (#51)
flipkart-incubator · Jan 12, 2024 · 74cfca6 · 74cfca6
2 parents f7ceb0f + a93ca90
commit 74cfca6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -8,16 +8,17 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        version: [8, 17, 21]
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK ${{ matrix.version }}
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: ${{ matrix.version }}
+        distribution: 'zulu'
         cache: gradle
 
     - name: Grant execute permission for gradlew

diff --git a/core/build.gradle b/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
-}	
+}
diff --git a/core/src/main/java/com/flipkart/gjex/core/service/AbstractService.java b/core/src/main/java/com/flipkart/gjex/core/service/AbstractService.java
@@ -185,4 +185,4 @@ public void setStopTimeout(long stopTimeout) {
 		this.stopTimeout = stopTimeout;
 	}
 
-}
+}
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -21,7 +21,7 @@ repositories {
 def jexpressVersion = '1.39-SNAPSHOT'
 def grpcVersion = '1.60.1'
 def protobufVersion = '3.12.0'
-def protocVersion = protobufVersion
+def protocVersion = protobufVersion 
 
 dependencies {
     implementation "com.flipkart.grpc-jexpress:core:${jexpressVersion}"
@@ -79,7 +79,8 @@ task runHelloWorldServer(type: JavaExec) {
     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")
+    args "server", "./src/main/resources/hello_world_config.yml"
+    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
 
 task helloWorldClient(type: CreateStartScripts) {
@@ -94,6 +95,7 @@ task runHelloWorldClient(type: JavaExec) {
     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') {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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
diff --git a/guice/build.gradle b/guice/build.gradle
@@ -60,7 +60,7 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 artifacts {

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 artifacts {