closes #394

Author: jvmlet

gradle.properties

@@ -1,4 +1,4 @@
-grpcVersion=1.58.0
+grpcVersion=1.71.0
 
 
 springBootVersion=3.4.4

grpc-spring-boot-starter-gradle-plugin/build.gradle

@@ -55,7 +55,7 @@ pluginBundle {
     tags = ['grpc', 'protobuf', 'spring-boot', 'grpc-spring-boot-starter']
 }
 dependencies {
-    runtimeOnly "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
+    runtimeOnly "com.google.protobuf:protobuf-gradle-plugin:0.9.4"
 }
 
 

grpc-spring-boot-starter-gradle-plugin/src/main/java/org/lognet/springboot/grpc/gradle/GrpcSpringBootExtension.java

@@ -21,7 +21,7 @@ public GrpcSpringBootExtension(Project project) {
 
 
         protocVersion = this.project.getObjects().property(String.class);
-        protocVersion.set("3.21.7");
+        protocVersion.set("3.25.5");
 
         reactiveProtocVersion = this.project.getObjects().property(String.class);
         reactiveProtocVersion.set("1.2.4");

grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle

@@ -24,13 +24,13 @@ switch (grpcSpringBoot.reactiveFeature.get().name()) {
     case "REACTOR":
         dependencies {
             implementation("com.salesforce.servicelibs:reactor-grpc-stub:${grpcSpringBoot.reactiveProtocVersion.get()}")
-            implementation("io.projectreactor:reactor-core:3.5.4")
+            implementation("io.projectreactor:reactor-core:3.6.11")
         }
         break;
     case "RX":
         dependencies {
             implementation("com.salesforce.servicelibs:rx3grpc-stub:${grpcSpringBoot.reactiveProtocVersion.get()}")
-            implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
+            implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
         }
         break;
 }
@@ -63,7 +63,7 @@ protobuf {
     }
 
     generateProtoTasks {
-        all().each { task ->
+        all().configureEach  { task ->
             task.builtins {
                 java {
                     option "annotate_code"

grpc-spring-boot-starter-native-demo/build.gradle

@@ -146,63 +146,6 @@ jar {
     enabled = true
     archiveClassifier.convention("")
 
-
-    // generate native config by executing test app in graalvm docker image
-    // then grab generated json files and filter to include class from `org.lognet.springboot.grpc` package only
-    dependsOn testDependencyFatJar
-    File aotDir = new File(buildDir, "native-configs");
-    File transformed = new File(aotDir, "transformed")
-    transformed.mkdirs()
-    from(transformed) {
-        into("META-INF/native-image/io.github.lognet/grpc-spring-boot-starter")
-        include "*.*"
-    }
-    doFirst {
-
-        exec {
-            commandLine("docker",
-                    "run", "--rm",
-                    "-v", "${tasks.testDependencyFatJar.archiveFile.get().getAsFile().parent}:/tmp",
-                    "-v", "${aotDir}:/out",
-                    "findepi/graalvm:java17-native",
-                    "java",
-                    "-agentlib:native-image-agent=config-output-dir=/out/",
-                    "-jar", "/tmp/${tasks.testDependencyFatJar.archiveFileName.get()}",
-                    "--auto-close=true",
-                    "--spring.cloud.consul.discovery.enabled=false",
-                    "--spring.cloud.consul.enabled=false",
-                    "--spring.cloud.service-registry.auto-registration.enabled=false"
-            )
-        }
-        new File(transformed, "reflection-config.json").withWriter { w ->
-            new File(aotDir, "reflect-config.json").withInputStream { is ->
-                def filtered = new JsonSlurper().parse(is)
-                        .findAll { it.name.contains("org.lognet.springboot.grpc") }
-                def finalJson = new groovy.json.JsonBuilder()
-                finalJson.call(filtered)
-                finalJson.writeTo(w)
-            }
-        }
-        new File(transformed, "resource-config.json").withWriter { w ->
-            new File(aotDir, "resource-config.json").withInputStream { is ->
-                def obj = new JsonSlurper().parse(is)
-
-                def filtered = obj.resources.includes
-                        .findAll { it.pattern.contains("org/lognet/springboot/grpc") }
-
-                def finalJson = new groovy.json.JsonBuilder()
-                finalJson {
-                    resources {
-                        includes(filtered)
-                    }
-                }
-                finalJson.writeTo(w)
-
-            }
-        }
-
-    }
-
 }
 
 
@@ -266,6 +209,7 @@ dependencies {
     compileOnly "io.grpc:grpc-netty:${grpcVersion}"
     api "io.grpc:grpc-netty-shaded:${grpcVersion}"
     api "io.grpc:grpc-services:${grpcVersion}"
+    api "io.grpc:grpc-protobuf:${grpcVersion}"
     api "io.grpc:grpc-inprocess:${grpcVersion}"
     api "org.springframework.boot:spring-boot-starter"
     api 'io.netty:netty-tcnative-boringssl-static:2.0.47.Final'

grpc-spring-boot-starter-native-demo/src/main/java/org/lognet/springboot/grpc/_native/demo/NativeDemoApp.java

@@ -11,5 +11,4 @@ rootProject.name = 'grpc-spring-boot-starter-root'
 include 'grpc-spring-boot-starter'
 include 'grpc-client-spring-boot-starter'
 include 'grpc-spring-boot-starter-demo'
-//include 'grpc-spring-boot-starter-native-demo'