diff --git a/gradle.properties b/gradle.properties index 14146a3d..1b4b2e06 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -grpcVersion=1.49.0 -springBootVersion=2.7.3 +grpcVersion=1.50.0 +springBootVersion=2.7.4 springCloudVersion=2021.0.3 gradleErrorPronePluginVersion=2.0.2 errorProneVersion=2.7.1 diff --git a/grpc-spring-boot-starter-gradle-plugin/build.gradle b/grpc-spring-boot-starter-gradle-plugin/build.gradle index cfbf4f2e..1f73ad52 100644 --- a/grpc-spring-boot-starter-gradle-plugin/build.gradle +++ b/grpc-spring-boot-starter-gradle-plugin/build.gradle @@ -55,7 +55,7 @@ pluginBundle { tags = ['grpc', 'protobuf', 'spring-boot', 'grpc-spring-boot-starter'] } dependencies { - runtime "com.google.protobuf:protobuf-gradle-plugin:0.8.18" + runtime "com.google.protobuf:protobuf-gradle-plugin:0.9.1" } diff --git a/grpc-spring-boot-starter-gradle-plugin/src/main/java/org/lognet/springboot/grpc/gradle/GrpcSpringBootExtension.java b/grpc-spring-boot-starter-gradle-plugin/src/main/java/org/lognet/springboot/grpc/gradle/GrpcSpringBootExtension.java index bfa65ebd..36b5b9cc 100644 --- a/grpc-spring-boot-starter-gradle-plugin/src/main/java/org/lognet/springboot/grpc/gradle/GrpcSpringBootExtension.java +++ b/grpc-spring-boot-starter-gradle-plugin/src/main/java/org/lognet/springboot/grpc/gradle/GrpcSpringBootExtension.java @@ -19,7 +19,7 @@ public GrpcSpringBootExtension(Project project) { protocVersion = this.project.getObjects().property(String.class); - protocVersion.set("3.19.2"); + protocVersion.set("3.21.7"); } diff --git a/grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle b/grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle index f4a367ac..761b622a 100644 --- a/grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle +++ b/grpc-spring-boot-starter-gradle-plugin/src/main/resources/grpc-spring-boot.gradle @@ -20,24 +20,6 @@ configurations.all { } -sourceSets.configureEach{s-> - java { - srcDir project.buildDir.toPath() - .resolve("protoGen") - .resolve(s.name) - .resolve("java") - .toFile() - - srcDir project.buildDir.toPath() - .resolve("protoGen") - .resolve(s.name) - .resolve("grpc") - .toFile() - } -} - - - protobuf { protoc { if(DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX()){