Merge branch '2.6.x' of github.com:freefair/okhttp-spring-boot into 2…

….7.x
freefair · Feb 26, 2022 · ac12bcf · ac12bcf
2 parents 69bdb29 + 70e27f4
commit ac12bcf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/autoconfigure/build.gradle b/autoconfigure/build.gradle
@@ -14,12 +14,18 @@ description = "OkHttp Spring Boot AutoConfigure"
 
 publishing.publications.mavenJava.artifactId = "okhttp-spring-boot-autoconfigure"
 
-javadoc.options.linkSource true
-javadoc.failOnError = false
+tasks.named('javadoc', Javadoc) {
+    options.linkSource true
+    failOnError = false
+}
 
-compileJava.dependsOn(processResources)
+tasks.named('compileJava') {
+    inputs.files(processResources)
+}
 
-jacocoTestReport.reports.xml.required = true
+tasks.named('jacocoTestReport', JacocoReport) {
+    reports.xml.required = true
+}
 
 dependencies {
     api platform(SpringBootPlugin.BOM_COORDINATES)
@@ -42,6 +48,6 @@ dependencies {
     }
 }
 
-test {
+tasks.named('test', Test) {
     useJUnitPlatform()
 }
diff --git a/build.gradle b/build.gradle
@@ -40,12 +40,14 @@ allprojects {
             }
         }
 
-        jar.into("META-INF") {
-            from rootProject.file("LICENSE")
+        tasks.named('jar', Jar) {
+            into("META-INF") {
+                from rootProject.file("LICENSE")
+            }
         }
     }
 
-    tasks.withType(Javadoc) {
+    tasks.withType(Javadoc).configureEach {
         options.addBooleanOption "Xdoclint:-missing", true
     }
 
@@ -113,7 +115,7 @@ nexusPublishing {
 
 apply plugin: "io.freefair.okhttp"
 
-task uploadDocumentation(type: io.freefair.gradle.plugins.okhttp.tasks.UploadFile) {
+tasks.register('uploadDocumentation', io.freefair.gradle.plugins.okhttp.tasks.UploadFile) {
     dependsOn "aggregateJavadocJar"
     username = "user"
     password = findProperty('freefairDocsPass')

diff --git a/starters/build.gradle b/starters/build.gradle
@@ -5,7 +5,9 @@ subprojects { Project starterProject ->
 
     starterProject.apply plugin: "java-library"
 
-    starterProject.jar.manifest {
-        attributes 'Spring-Boot-Jar-Type': 'dependencies-starter'
+    starterProject.tasks.named('jar', Jar) {
+        manifest {
+            attributes 'Spring-Boot-Jar-Type': 'dependencies-starter'
+        }
     }
 }