Update Gradle to 5.5 (#136)

* Update Gradle to 5.5 * Add missing `testAnnotationProcessor` * inherit test framework in rerun
bsideup · Jul 11, 2019 · f1f428e · f1f428e
1 parent ffd47b5
commit f1f428e
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 27 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -3,10 +3,12 @@ sourceCompatibility = targetCompatibility = 8
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
 
  compile 'org.reactivestreams:reactive-streams'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'junit:junit'
  testCompile 'org.assertj:assertj-core'
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'org.springframework.boot'
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
 
  compile project(":api")
  compile project(":protocol")
@@ -15,6 +16,7 @@ dependencies {
  compile 'io.rsocket:rsocket-transport-netty'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'org.springframework.boot:spring-boot-starter-test'
  testCompile 'org.assertj:assertj-core'
  testCompile 'org.awaitility:awaitility'

diff --git a/client/build.gradle b/client/build.gradle
@@ -3,6 +3,7 @@ sourceCompatibility = targetCompatibility = 8
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
 
  compile project(":protocol")
 

diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -47,6 +47,7 @@ repositories {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok:1.18.8'
+ annotationProcessor 'org.projectlombok:lombok:1.18.8'
 
  compile 'org.testcontainers:kafka:1.11.4'
 

diff --git a/examples/plugin/build.gradle b/examples/plugin/build.gradle
@@ -52,7 +52,9 @@ dependencyManagement {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly "com.google.auto.service:auto-service"
+ annotationProcessor "com.google.auto.service:auto-service"
 
  compileOnly "com.github.bsideup.liiklus:api"
  compileOnly 'org.springframework.boot:spring-boot-starter'

diff --git a/gradle/rerunTests.gradle b/gradle/rerunTests.gradle
@@ -1,33 +1,37 @@
-tasks.withType(Test) {
- if (name.endsWith("Rerun")) {
- // Avoid recursion
- return
- }
+project.afterEvaluate {
+ tasks.withType(Test) { originalTask ->
+ if (name.endsWith("Rerun")) {
+ // Avoid recursion
+ return
+ }
+
+ def rerunTask = tasks.register("${name}Rerun", Test) {
+ // Enabled only when there are failures (see `afterTest`)
+ enabled = false
+ failFast = true // ¯\_(ツ)_/¯
+ outputs.upToDateWhen { false }
 
- def rerunTask = tasks.register("${name}Rerun", Test) {
- // Enabled only when there are failures (see `afterTest`)
- enabled = false
- failFast = true // ¯\_(ツ)_/¯
- outputs.upToDateWhen { false }
+ beforeTest { desc -> logger.warn("Re-running ${desc.className}.${desc.name}") }
 
- beforeTest { desc -> logger.warn("Re-running ${desc.className}.${desc.name}") }
+  useTestFramework(originalTask.getTestFramework())
 
- testLogging {
- displayGranularity 1
- showStackTraces = true
- exceptionFormat = 'full'
- events "STARTED", "PASSED", "FAILED", "SKIPPED"
+ testLogging {
+ displayGranularity 1
+ showStackTraces = true
+ exceptionFormat = 'full'
+ events "STARTED", "PASSED", "FAILED", "SKIPPED"
+ }
  }
- }
 
- ignoreFailures = true
- finalizedBy(rerunTask)
+  ignoreFailures = true
+  finalizedBy(rerunTask)
 
- afterTest { desc, result ->
- if (TestResult.ResultType.FAILURE == result.resultType) {
- rerunTask.configure {
- enabled = true
- filter.includeTestsMatching("${desc.className}.${desc.name}")
+ afterTest { desc, result ->
+ if (TestResult.ResultType.FAILURE == result.resultType) {
+ rerunTask.configure {
+ enabled = true
+ filter.includeTestsMatching("${desc.className}.${desc.name}")
+ }
  }
  }
  }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.5-all.zip
diff --git a/plugins/dynamodb-positions-storage/build.gradle b/plugins/dynamodb-positions-storage/build.gradle
@@ -17,6 +17,7 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
@@ -30,6 +31,7 @@ dependencies {
  }
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
  testCompile project(":tck")
  testCompile 'org.testcontainers:localstack'

diff --git a/plugins/inmemory-positions-storage/build.gradle b/plugins/inmemory-positions-storage/build.gradle
@@ -17,13 +17,16 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
+ annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
  compileOnly project(":api")
  compileOnly 'io.projectreactor:reactor-core'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
  testCompile project(":tck")
 }
diff --git a/plugins/inmemory-records-storage/build.gradle b/plugins/inmemory-records-storage/build.gradle
@@ -17,14 +17,17 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
+ annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
  compileOnly 'org.springframework.boot:spring-boot-starter-validation'
  compileOnly project(":api")
  compileOnly 'io.projectreactor:reactor-core'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
  testCompile project(":tck")

diff --git a/plugins/kafka-records-storage/build.gradle b/plugins/kafka-records-storage/build.gradle
@@ -17,7 +17,9 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
+ annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
  compileOnly 'org.springframework.boot:spring-boot-starter-validation'
@@ -29,6 +31,7 @@ dependencies {
  }
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
  testCompile project(":tck")

diff --git a/plugins/pulsar-records-storage/build.gradle b/plugins/pulsar-records-storage/build.gradle
@@ -21,7 +21,9 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
+ annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
  compileOnly 'org.springframework.boot:spring-boot-starter-validation'
@@ -33,6 +35,7 @@ dependencies {
  }
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
  testCompile project(":tck")

diff --git a/plugins/schema/build.gradle b/plugins/schema/build.gradle
@@ -17,7 +17,9 @@ jar {
 
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
+ testAnnotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly 'org.springframework.boot:spring-boot-starter'
  compileOnly project(":api")
@@ -31,6 +33,7 @@ dependencies {
  compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'org.junit.jupiter:junit-jupiter-api'
  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

diff --git a/settings.gradle b/settings.gradle
@@ -5,8 +5,8 @@ include 'protocol'
 include 'client'
 include 'testing'
 
-include 'examples/java'
-include 'examples/plugin'
+include 'examples:java'
+include 'examples:plugin'
 
 file('plugins').eachDir { dir ->
  def projectName = dir.name

diff --git a/tck/build.gradle b/tck/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
 
  compile project(":api")
 

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -1,10 +1,12 @@
 dependencies {
  compileOnly 'org.projectlombok:lombok'
+ annotationProcessor 'org.projectlombok:lombok'
 
  compile 'org.testcontainers:testcontainers'
  compile 'org.testcontainers:kafka'
 
  testCompileOnly 'org.projectlombok:lombok'
+ testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'ch.qos.logback:logback-classic'
  testCompile 'org.assertj:assertj-core'
  testCompile 'org.awaitility:awaitility'