minor code style improvements

unbroken-dome · Jun 22, 2017 · da3041b · da3041b
1 parent 86b7671
commit da3041b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/groovy/org/unbrokendome/gradle/plugins/testsets/TestSetsPlugin.groovy b/src/main/groovy/org/unbrokendome/gradle/plugins/testsets/TestSetsPlugin.groovy
@@ -8,13 +8,15 @@ import org.unbrokendome.gradle.plugins.testsets.internal.*
 
 import javax.inject.Inject
 
-public class TestSetsPlugin implements Plugin<Project> {
+class TestSetsPlugin implements Plugin<Project> {
+
+    static final TESTSETS_EXTENSION_NAME = 'testSets'
 
     private final Instantiator instantiator
 
 
     @Inject
-    public TestSetsPlugin(Instantiator instantiator) {
+    TestSetsPlugin(Instantiator instantiator) {
         this.instantiator = instantiator
     }
 
@@ -23,7 +25,7 @@ public class TestSetsPlugin implements Plugin<Project> {
     void apply(Project project) {
         project.apply plugin: JavaPlugin
 
-        project.extensions.create('testSets', DefaultTestSetContainer, instantiator)
+        project.extensions.create(TESTSETS_EXTENSION_NAME, DefaultTestSetContainer, instantiator)
 
         instantiator.newInstance SourceSetListener, project
         instantiator.newInstance ConfigurationDependencyListener, project

diff --git a/src/main/groovy/org/unbrokendome/gradle/plugins/testsets/internal/ArtifactListener.groovy b/src/main/groovy/org/unbrokendome/gradle/plugins/testsets/internal/ArtifactListener.groovy
@@ -28,8 +28,8 @@ class ArtifactListener {
 
                 def jarTask = project.tasks.findByName(testSet.jarTaskName)
 
-                project.artifacts.add(testSet.artifactConfigurationName, jarTask) {
-                    classifier = testSet.classifier
+                project.artifacts.add(testSet.artifactConfigurationName, jarTask) { artifact ->
+                    artifact.classifier = testSet.classifier
                 }
             }
         }

diff --git a/...n/groovy/org/unbrokendome/gradle/plugins/testsets/internal/DefaultTestSetContainer.groovy b/...n/groovy/org/unbrokendome/gradle/plugins/testsets/internal/DefaultTestSetContainer.groovy
@@ -30,7 +30,7 @@ class DefaultTestSetContainer extends AbstractNamedDomainObjectContainer<TestSet
 
         if (added) {
             if (testSet instanceof ConfigurableTestSet) {
-                ((ConfigurableTestSet) testSet).extendsFrom(predefinedUnitTestSet);
+                ((ConfigurableTestSet) testSet).extendsFrom(predefinedUnitTestSet)
             }
         }