closes #328

Author: jvmlet

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven { url 'http://repo.spring.io/plugins-release' }
+        maven { url 'https://repo.spring.io/plugins-release' }
         maven { url "https://plugins.gradle.org/m2/" }
 
         maven { url 'https://repo.spring.io/snapshot' }

gradle.properties

@@ -3,7 +3,7 @@ springBootVersion=2.7.6
 springCloudVersion=2021.0.3
 gradleErrorPronePluginVersion=2.0.2
 errorProneVersion=2.7.1
-lombokVersion=1.18.20
+lombokVersion=1.18.24
 
 version=4.9.1
 group=io.github.lognet
@@ -16,3 +16,4 @@ nexusUsername=secured
 signing.keyId=secured
 signing.password=secured
 signing.secretKeyRingFile=secured
+

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -8,8 +8,9 @@ buildscript {
         classpath "io.franzbecker:gradle-lombok:4.0.0"
     }
 }
-
-apply plugin: 'java'
+plugins {
+    id 'java-library'
+}
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: "de.marcphilipp.nexus-publish"
@@ -112,7 +113,7 @@ signing {
 
 
 dependencies {
-    compile "io.grpc:grpc-api:${grpcVersion}"
+    api "io.grpc:grpc-api:${grpcVersion}"
 }
 compileJava.dependsOn(processResources)
 

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

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-        classpath "com.netflix.nebula:nebula-project-plugin:7.0.7"
+        classpath "com.netflix.nebula:nebula-project-plugin:9.4.0"
     }
 }
 plugins {
@@ -56,10 +56,10 @@ configurations.findAll{ cfg ->
 
 extensions.facets.each{
     if(it.name.endsWith("Test")) {
-        configurations.getByName("${it.name}Compile").extendsFrom(configurations.testCompile)
-        configurations.getByName("${it.name}Runtime").extendsFrom(configurations.testRuntime)
+        configurations.getByName("${it.name}Implementation").extendsFrom(configurations.testImplementation)
+        configurations.getByName("${it.name}RuntimeOnly").extendsFrom(configurations.testRuntimeOnly)
 
-        dependencies.add("${it.name}Compile", sourceSets.test.output)
+        dependencies.add("${it.name}Implementation", sourceSets.test.output)
     }
 }
 
@@ -79,29 +79,29 @@ dependencies {
     implementation project(':grpc-spring-boot-starter')
     implementation project(':grpc-client-spring-boot-starter')
 
-    testCompile 'org.springframework.boot:spring-boot-starter-aop'
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'com.github.stefanbirkner:system-rules:1.18.0'
-    testCompile('org.springframework.cloud:spring-cloud-starter-consul-discovery')
-    testCompile 'org.awaitility:awaitility:4.0.3'
-    testCompile "org.springframework.cloud:spring-cloud-config-server"
-    testCompile "org.springframework.cloud:spring-cloud-config-client"
-    testCompile "org.springframework.cloud:spring-cloud-starter-bootstrap"
+    testImplementation 'org.springframework.boot:spring-boot-starter-aop'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.18.0'
+    testImplementation('org.springframework.cloud:spring-cloud-starter-consul-discovery')
+    testImplementation 'org.awaitility:awaitility:4.0.3'
+    testImplementation "org.springframework.cloud:spring-cloud-config-server"
+    testImplementation "org.springframework.cloud:spring-cloud-config-client"
+    testImplementation "org.springframework.cloud:spring-cloud-starter-bootstrap"
 
-    testCompile "com.playtika.testcontainers:embedded-keycloak:2.2.2"
-    testCompile "com.playtika.testcontainers:embedded-consul:2.2.2"
+    testImplementation "com.playtika.testcontainers:embedded-keycloak:2.2.2"
+    testImplementation "com.playtika.testcontainers:embedded-consul:2.2.2"
 
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
 
-    pureNettyTestCompile "io.grpc:grpc-netty"
+    pureNettyTestImplementation "io.grpc:grpc-netty"
 
 
-    bothPureAndShadedNettyTestCompile "io.grpc:grpc-netty"
+    bothPureAndShadedNettyTestImplementation "io.grpc:grpc-netty"
 
-    kafkaStreamTestCompile "com.playtika.testcontainers:embedded-kafka:2.2.2"
-    kafkaStreamTestCompile "org.springframework.cloud:spring-cloud-starter-stream-kafka"
+    kafkaStreamTestImplementation "com.playtika.testcontainers:embedded-kafka:2.2.2"
+    kafkaStreamTestImplementation "org.springframework.cloud:spring-cloud-starter-stream-kafka"
 
 
 }

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.9.1"
+    runtimeOnly "com.google.protobuf:protobuf-gradle-plugin:0.9.1"
 }
 
 

grpc-spring-boot-starter/build.gradle

@@ -11,6 +11,7 @@ buildscript {
     }
 }
 plugins {
+    id 'java-library'
     id "de.undercouch.download" version "4.1.1"
     id "com.github.sherter.google-java-format" version "0.9"
     id "io.github.lognet.grpc-spring-boot"
@@ -19,7 +20,7 @@ plugins {
 grpcSpringBoot {
     grpcSpringBootStarterVersion.set((String)null)
 }
-apply plugin: 'java'
+
 apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'maven-publish'
@@ -28,7 +29,7 @@ apply plugin: "de.marcphilipp.nexus-publish"
 apply plugin: 'io.franzbecker.gradle-lombok'
 
 configurations{
-    testCompile {
+    testImplementation {
         exclude group: 'io.netty', module: 'netty-tcnative-boringssl-static'
         exclude group: 'io.grpc', module: 'grpc-netty-shaded'
     }
@@ -83,7 +84,7 @@ task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
 }
 
 googleJavaFormat {
-    toolVersion = '1.9'
+    toolVersion = '1.15.0'
     source = delombokOutputDir
     include '**/*.java'
 }
@@ -129,11 +130,12 @@ nexusPublishing {
     }
 
 }
+configurations.testImplementation.setCanBeResolved(true)
+
 task testDependencyFatJar(type: org.springframework.boot.gradle.tasks.bundling.BootJar) {
     dependsOn testClasses,classes
-
     mainClass =  'org.lognet.grpc.demo.DemoApp'
-    setClasspath(configurations.testCompile)
+    setClasspath(configurations.testImplementation)
     doFirst {
         classpath sourceSets.getByName("test").java.outputDir
         classpath sourceSets.getByName("main").output
@@ -268,10 +270,10 @@ signing {
 
 dependencies {
     compileOnly "io.grpc:grpc-netty:${grpcVersion}"
-    compile "io.grpc:grpc-netty-shaded:${grpcVersion}"
-    compile "io.grpc:grpc-services:${grpcVersion}"
-    compile "org.springframework.boot:spring-boot-starter"
-    compile 'io.netty:netty-tcnative-boringssl-static:2.0.47.Final'
+    api "io.grpc:grpc-netty-shaded:${grpcVersion}"
+    api "io.grpc:grpc-services:${grpcVersion}"
+    api "org.springframework.boot:spring-boot-starter"
+    api 'io.netty:netty-tcnative-boringssl-static:2.0.47.Final'
 
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
@@ -283,8 +285,8 @@ dependencies {
     compileOnly 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
 
 
-    testCompile "io.grpc:grpc-netty"
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation "io.grpc:grpc-netty"
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
 }