diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 6945ef4f..a29e188e 100644 --- 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 index 19d9b8e9..32bee66a 100644 --- 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 -} \ No newline at end of file +} 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 index fa90fc25..99e93681 100644 --- 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; } -} \ No newline at end of file +} diff --git a/examples/build.gradle b/examples/build.gradle index 079bad38..2465747e 100644 --- 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 index ffed3a25..a5952066 100644 --- 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 index 10b88538..787bc393 100644 --- 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 index 7777342b..ed1c1328 100644 --- 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 {