Fix most Gradle warnings in build (#2904)

mockito · Feb 11, 2023 · 87ee387 · 87ee387
1 parent 38b1f44
commit 87ee387
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -82,6 +82,9 @@ allprojects { proj ->
 
 configurations {
     testUtil //TODO move to separate project
+    // Putting 'provided' dependencies on test compile and runtime classpath.
+    testCompileOnly.extendsFrom(compileOnly)
+    testRuntimeOnly.extendsFrom(compileOnly)
 }
 
 dependencies {
@@ -92,10 +95,6 @@ dependencies {
 
     testImplementation libraries.assertj
 
-    //putting 'provided' dependencies on test compile and runtime classpath
-    testCompileOnly configurations.compileOnly
-    testRuntimeOnly configurations.compileOnly
-
     testUtil sourceSets.test.output
 
     signature 'org.codehaus.mojo.signature:java18:1.0@signature'

diff --git a/gradle/java-library.gradle b/gradle/java-library.gradle
@@ -30,8 +30,8 @@ apply from: "$rootDir/gradle/retry-test.gradle"
 
 tasks.withType(Checkstyle) {
     reports {
-        xml.enabled false
-        html.enabled true
+        xml.required = false
+        html.required = true
         html.stylesheet resources.text.fromFile("$rootDir/config/checkstyle/checkstyle.xsl")
     }
 }
diff --git a/gradle/java-publication.gradle b/gradle/java-publication.gradle
@@ -58,7 +58,7 @@ publishing {
                     //Gradle does not write 'jar' packaging to the pom (unlike other packaging types).
                     //This is OK because 'jar' is implicit/default:
                     // https://maven.apache.org/guides/introduction/introduction-to-the-pom.html#minimal-pom
-                    packaging = project.tasks.jar.extension
+                    packaging = project.tasks.jar.archiveExtension.get()
                 }
 
                 url = "https://github.com/mockito/mockito"

diff --git a/gradle/mockito-core/osgi.gradle b/gradle/mockito-core/osgi.gradle
@@ -8,7 +8,7 @@ jar {
             'Bundle-SymbolicName': 'org.mockito.mockito-core',
             'Bundle-Version': "\${version_cleanup;${project.version}}",
             '-versionpolicy': '[${version;==;${@}},${version;+;${@}})',
-            'Export-Package': "org.mockito.internal.*;status=INTERNAL;mandatory:=status;version=${version},org.mockito.*;version=${version}",
+            'Export-Package': "org.mockito.internal.*;status=INTERNAL;mandatory:=status;version=${archiveVersion.get()},org.mockito.*;version=${archiveVersion.get()}",
             'Import-Package': [
                     'net.bytebuddy.*;version="[1.6.0,2.0)"',
                     'junit.*;resolution:=optional',

diff --git a/gradle/root/coverage.gradle b/gradle/root/coverage.gradle
@@ -35,8 +35,8 @@ task mockitoCoverage(type: JacocoReport) {
     }
 
     reports {
-        xml.enabled true
-        html.enabled true
+        xml.required = true
+        html.required = true
         html.destination file("${buildDir}/jacocoHtml")
     }
 

diff --git a/subprojects/junit-jupiter/junit-jupiter.gradle b/subprojects/junit-jupiter/junit-jupiter.gradle
@@ -25,7 +25,7 @@ jar {
             'Bundle-SymbolicName': 'org.mockito.junit-jupiter',
             'Bundle-Version': "\${version_cleanup;${project.version}}",
             '-versionpolicy': '[${version;==;${@}},${version;+;${@}})',
-            'Export-Package': "org.mockito.junit.jupiter.*;version=${version}",
+            'Export-Package': "org.mockito.junit.jupiter.*;version=${archiveVersion.get()}",
             '-removeheaders': 'Private-Package',
             'Automatic-Module-Name': 'org.mockito.junit.jupiter',
             '-noextraheaders': 'true',