[incubator-tuweni] branch parallel_build updated: rat depends on spotlessCheck

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

toulmean pushed a commit to branch parallel_build
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git


The following commit(s) were added to refs/heads/parallel_build by this push:
     new d596b9c  rat depends on spotlessCheck
d596b9c is described below

commit d596b9c40e021e048ab4b60370e21bb527cb382b
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 1 00:28:02 2020 -0700

    rat depends on spotlessCheck
---
 build.gradle      | 25 +++++++++++++------------
 gradle/rat.gradle |  1 -
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index c714dfc..5d5638b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,6 +126,7 @@ if (file('.git').exists()) {
       return list
     }
   }
+  spotlessCheck.dependsOn rat
 }
 
 //////
@@ -315,23 +316,23 @@ allprojects {
   // Artifact locations
 
   jar {
-    destinationDir = file("${rootProject.buildDir}/libs")
+    destinationDirectory = file("${rootProject.buildDir}/libs")
   }
 
   task sourcesJar(type: Jar, dependsOn: classes) {
-    destinationDir = file("${rootProject.buildDir}/src")
+    destinationDirectory = file("${rootProject.buildDir}/src")
     classifier = 'sources'
     from sourceSets.main.allSource
   }
 
   task javadocJar(type: Jar, dependsOn: javadoc) {
-    destinationDir = file("${rootProject.buildDir}/docs")
+    destinationDirectory = file("${rootProject.buildDir}/docs")
     classifier = 'javadoc'
-    from javadoc.destinationDir
+    from javadoc.outputDirectory
   }
 
   task dokkaJar(type: Jar, dependsOn: dokka) {
-    destinationDir = file("${rootProject.buildDir}/docs")
+    destinationDirectory = file("${rootProject.buildDir}/docs")
     classifier = 'dokka'
     from dokka.outputDirectory
   }
@@ -342,12 +343,12 @@ allprojects {
 
   tasks.withType(Jar) {
     if (rootProject == project) {
-      baseName = project.name
+      archiveBaseName = project.name
     } else {
-      baseName = rootProject.name + '-' + project.name
+      archiveBaseName = rootProject.name + '-' + project.name
     }
     manifest {
-      attributes('Implementation-Title': baseName,
+      attributes('Implementation-Title': archiveBaseName,
       'Implementation-Version': project.version)
     }
     from(rootProject.projectDir) {
@@ -415,11 +416,11 @@ allprojects {
           }
           artifact dokkaJar { classifier 'javadoc' }
           groupId 'org.apache.tuweni'
-          artifactId project.jar.baseName
+          artifactId project.jar.archiveBaseName.toString()
           version project.version
 
           pom {
-            name = project.jar.baseName
+            name = project.jar.archiveBaseName
             afterEvaluate { description = project.description }
             url = 'https://github.com/apache/incubator-tuweni'
             licenses {
@@ -623,9 +624,9 @@ dokka {
 }
 
 dokkaJar {
-  baseName = rootProject.name
+  archiveBaseName = rootProject.name
   manifest {
-    attributes('Implementation-Title': baseName,
+    attributes('Implementation-Title': archiveBaseName,
     'Implementation-Version': project.version)
   }
 }
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 070797e..93f43c5 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -104,7 +104,6 @@ class RatPlugin implements Plugin<Project> {
     type: RatTask,
     group: 'Build',
     description: 'Runs Apache Rat checks.')
-    project.tasks[JavaPlugin.TEST_TASK_NAME].dependsOn ratTask
   }
 
   void configureDependencies(final Project project) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org